aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 20:34:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-24 23:08:36 +0100
commitd472d1a1c82ade81d2854db2ff4c9694ed66612e (patch)
tree66b00d6d13a73ef4aff17bb35c72926d4cd12940 /arch/arm/plat-s5p/Kconfig
parentMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable (diff)
parentARM: s3c6400_defconfig: Add NAND driver (diff)
downloadlinux-dev-d472d1a1c82ade81d2854db2ff4c9694ed66612e.tar.xz
linux-dev-d472d1a1c82ade81d2854db2ff4c9694ed66612e.zip
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
-rw-r--r--arch/arm/plat-s5p/Kconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 92bd75607b43..5cb2dd1da632 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -7,7 +7,7 @@
config PLAT_S5P
bool
- depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210)
+ depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210)
default y
select ARM_VIC
select NO_IOPORT
@@ -24,3 +24,8 @@ config PLAT_S5P
select SAMSUNG_IRQ_UART
help
Base platform code for Samsung's S5P series SoC.
+
+config S5P_EXT_INT
+ bool
+ help
+ Use the external interrupts (other than GPIO interrupts.)