ARM: Merge for-2635-4/ts-machines

Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1

diff --combined arch/arm/mach-s5pv210/Kconfig
index 8b9566e0cc514f56f7f6b30e6f8232763e93f676,b05988f21ec2ac7f54741e2a1033a297a866c908..5649733bf815dff511f3a652d14dbe21259ac6d9
--- 1/arch/arm/mach-s5pv210/Kconfig
--- 2/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@@ -13,7 -13,6 +13,7 @@@ config CPU_S5PV21
        bool
        select PLAT_S5P
        select S3C_PL330_DMA
 +      select S5P_EXT_INT
        help
          Enable S5PV210 CPU support
  
@@@ -26,6 -25,8 +26,8 @@@ config MACH_SMDKV21
        bool "SMDKV210"
        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
        help
          Machine support for Samsung SMDKV210