diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 20:14:17 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 20:14:17 +0400 |
| commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
| tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/mach-u300/Kconfig | |
| parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
| parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) | |
| download | linux-244acb1ba3777c2eb4d33ddc246cab5419656442.tar.xz | |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/mach-u300/Kconfig')
| -rw-r--r-- | arch/arm/mach-u300/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index f7e12ede008c..1f597647d431 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig @@ -7,8 +7,8 @@ comment "ST-Ericsson Mobile Platform Products" config MACH_U300 bool "U300" select PINCTRL - select PINCTRL_U300 select PINCTRL_COH901 + select PINCTRL_U300 comment "ST-Ericsson U300/U335 Feature Selections" |