ARM: Merge for-2635-4/s5pc1xx-removal

Merge branch 'for-2635-4/s5pc1xx-removal' into for-2635-4/partial1

diff --combined arch/arm/plat-s5p/Kconfig
index c2361132d8671e0286abfdab039111923a8c29a2,189be6e95226f069e0e28edb0c58777c4bd149bc..5cb2dd1da6326cf8073b0c257fb9edfdcde3bd18
--- 1/arch/arm/plat-s5p/Kconfig
--- 2/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@@ -7,7 -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,8 -24,3 +24,8 @@@
        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.)