---

yaml --- r: 192074 b: refs/heads/master c: 2b6c02a h: refs/heads/master v: v3
git-mirror · May 19, 2010 · bedb23e · bedb23e
1 parent e1bfc10
commit bedb23e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bfdca146edc558ae6b3bac6b05dc5b1f094fbf3
+refs/heads/master: 2b6c02abca5a04bf8d9f8a3b1976a5b10d317603
diff --git a/trunk/arch/arm/plat-samsung/Kconfig b/trunk/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/trunk/arch/arm/plat-samsung/Makefile b/trunk/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/trunk/arch/arm/mach-s3c64xx/dev-ts.c → trunk/arch/arm/plat-samsung/dev-ts.c b/trunk/arch/arm/mach-s3c64xx/dev-ts.c → trunk/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] = {