summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p/Kconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 18:51:31 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 18:51:31 +0900
commitd48562abe29ceee66a6aad7b565b021ddd7f598a (patch)
tree5f70539f7c3bc90ec9ec0f53c5105e45f8f508f9 /arch/arm/plat-s5p/Kconfig
parent0df04f820b7ca5204329d1c235e509648fa8008d (diff)
parenta73e3e6f8f5847c00edb9dd7aab19d005a3d6e5c (diff)
downloadlinux-d48562abe29ceee66a6aad7b565b021ddd7f598a.tar.bz2
ARM: Merge for-2635-4/s5pc1xx-removal
Merge branch 'for-2635-4/s5pc1xx-removal' into for-2635-4/partial1
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
-rw-r--r--arch/arm/plat-s5p/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index c2361132d867..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