aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 19:28:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 19:28:04 +0100
commit9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch)
tree894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/plat-omap/Kconfig
parentec19628d72cff8f80220b7cedba089074ac6a599 (diff)
parentdc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff)
downloadkernel_samsung_smdk4412-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.zip
kernel_samsung_smdk4412-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.gz
kernel_samsung_smdk4412-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.bz2
Merge branch 'devel-stable' into for-linus
Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
-rw-r--r--arch/arm/plat-omap/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index e9c0efc..49a4c75 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -19,6 +19,7 @@ config ARCH_OMAP1
config ARCH_OMAP2PLUS
bool "TI OMAP2/3/4"
select CLKDEV_LOOKUP
+ select GENERIC_IRQ_CHIP
select OMAP_DM_TIMER
help
"Systems based on OMAP2, OMAP3 or OMAP4"