diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 11:41:51 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 11:41:51 +0200 |
commit | 3c3dd225819112e56554162c6b37e61a31924e0c (patch) | |
tree | 5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /arch/arm/plat-omap/Kconfig | |
parent | Revert "OMAPDSS: HDMI: Create platform device for audio support" (diff) | |
parent | Linux 3.7-rc4 (diff) | |
download | linux-dev-3c3dd225819112e56554162c6b37e61a31924e0c.tar.xz linux-dev-3c3dd225819112e56554162c6b37e61a31924e0c.zip |
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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 |