From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 19 May 2010 05:36:28 +0000 (+0900)
Subject: ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration
X-Git-Tag: v3.12-rc1~10305^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b6c02abca5a04bf8d9f8a3b1976a5b10d317603;p=kernel%2Fkernel-generic.git

ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration

Move the arch/arm/mach-s3c64xx/dev-ts.c file to arch/arm/plat-samsung and
rename the Kconfig entry appropriately.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 896b171..229919e 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 7068af3..4828849 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
similarity index 95%
rename from arch/arm/mach-s3c64xx/dev-ts.c
rename to arch/arm/plat-samsung/dev-ts.c
index 17cc793..236ef84 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] = {