diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/mach-u300/Kconfig | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/mach-u300/Kconfig')
| -rw-r--r-- | arch/arm/mach-u300/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index 1cbcd4fc1e17..54d8f34fdee5 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig | |||
| @@ -7,8 +7,8 @@ comment "ST-Ericsson Mobile Platform Products" | |||
| 7 | config MACH_U300 | 7 | config MACH_U300 |
| 8 | bool "U300" | 8 | bool "U300" |
| 9 | select PINCTRL | 9 | select PINCTRL |
| 10 | select PINMUX_U300 | 10 | select PINCTRL_U300 |
| 11 | select GPIO_U300 | 11 | select PINCTRL_COH901 |
| 12 | 12 | ||
| 13 | comment "ST-Ericsson U300/U330/U335/U365 Feature Selections" | 13 | comment "ST-Ericsson U300/U330/U335/U365 Feature Selections" |
| 14 | 14 | ||