diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:18 +0000 |
|---|---|---|
| committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:18 +0000 |
| commit | e5a726ae83bdf8a9b9328b061cdbef0b16545624 (patch) | |
| tree | f57922ac9deed5045fe594336dedb8a91397c898 | |
| parent | 0858b9f5ca2872d93a8cb33207fade4ad06e62df (diff) | |
tracking-2442-2.6.28-rc2-i2c-6410-changes.patch
Signed-off-by: Andy Green <andy@openmoko.com>
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 8 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/devs.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index bfc46dba0e4..3e201f49e05 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -71,11 +71,11 @@ #include <mach/gta02.h> #include <plat/regs-serial.h> -#include <asm/plat-s3c/nand.h> -#include <asm/plat-s3c24xx/devs.h> +#include <plat/nand.h> +#include <plat/devs.h> #include <plat/cpu.h> #include <plat/pm.h> -#include <asm/plat-s3c24xx/udc.h> +#include <plat/udc.h> #include <asm/plat-s3c24xx/neo1973.h> #include <mach/neo1973-pm-gsm.h> @@ -1571,7 +1571,7 @@ static struct platform_device *gta02_devices[] __initdata = { >a02_pmu_dev, &s3c_device_iis, - &s3c_device_i2c, + &s3c_device_i2c0, }; /* these guys DO need to be children of PMU */ diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 6b1b5231511..cf160ab4752 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h @@ -45,10 +45,11 @@ extern struct platform_device s3c_device_nand; extern struct platform_device s3c_device_usbgadget; +extern struct platform_device s3c_device_ts; + /* s3c2440 specific devices */ #ifdef CONFIG_CPU_S3C2440 extern struct platform_device s3c_device_camif; - #endif |