diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-22 13:29:19 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-22 13:37:34 -0700 |
| commit | 24942e8af19e5090374776a57db97b350ffd0fa6 (patch) | |
| tree | 7d95495b21e6f41da9e347bcb127bdb4bed76483 /arch | |
| parent | eef6fcaa4295168e6eab2cce564ea258155e1bd7 (diff) | |
| download | talos-obmc-linux-24942e8af19e5090374776a57db97b350ffd0fa6.tar.gz talos-obmc-linux-24942e8af19e5090374776a57db97b350ffd0fa6.zip | |
ARM: OMAP2+: Fix location of select PINCTRL
Commit 8f31cefe (ARM: OMAP2+: select PINCTRL in Kconfig)
added select PINCTRL, but accdentally added it to a wrong
location.
We want to select if for ARCH_OMAP2PLUS, not for
ARCH_OMAP2PLUS_TYPICAL.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 2a1a898c7f90..d669e227e00c 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -11,7 +11,6 @@ config ARCH_OMAP2PLUS_TYPICAL select I2C_OMAP select MENELAUS if ARCH_OMAP2 select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 - select PINCTRL select PM_RUNTIME select REGULATOR select SERIAL_OMAP diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 7cd56ed5cd94..82fcb206b5b2 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -26,6 +26,7 @@ config ARCH_OMAP2PLUS select CLKDEV_LOOKUP select GENERIC_IRQ_CHIP select OMAP_DM_TIMER + select PINCTRL select PROC_DEVICETREE if PROC_FS select SPARSE_IRQ select USE_OF |
