3 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 896b171bd430..229919e9744c 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -206,11 +206,10 @@ config S3C64XX_DEV_SPI
           Compile in platform device definitions for S3C64XX's type
           SPI controllers.
 
-config S3C64XX_DEV_TS
+config SAMSUNG_DEV_TS
         bool
         help
-            Common in platform device definitions for S3C64XX touchscreen
-            device
+            Common in platform device definitions for touchscreen device
 
 # DMA
 
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 7068af322e73..48288499a3b9 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o
 obj-$(CONFIG_S3C_DEV_RTC)       += dev-rtc.o
 
 obj-$(CONFIG_SAMSUNG_DEV_ADC)   += dev-adc.o
+obj-$(CONFIG_SAMSUNG_DEV_TS)    += dev-ts.o
 
 # DMA support
 
diff --git a/arch/arm/mach-s3c64xx/dev-ts.c b/arch/arm/plat-samsung/dev-ts.c
index 17cc7934afbe..236ef8427d7d 100644
--- a/arch/arm/mach-s3c64xx/dev-ts.c
+++ b/arch/arm/plat-samsung/dev-ts.c
@@ -25,8 +25,8 @@
 
 static struct resource s3c_ts_resource[] = {
         [0] = {
-                .start = S3C64XX_PA_ADC,
-                .end   = S3C64XX_PA_ADC + SZ_256 - 1,
+                .start = SAMSUNG_PA_ADC,
+                .end   = SAMSUNG_PA_ADC + SZ_256 - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {