diff options
author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:06 +0000 |
---|---|---|
committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:06 +0000 |
commit | d5b248f08d34926f3136c2b7b611ea1aff19d238 (patch) | |
tree | dc5db2124018d30d3471f489b45f37be852ea343 /arch | |
parent | c727e99d84972bd03f62de99acffcfc4e13952b9 (diff) |
tracking-2.6.28-breakage-after-change-to-64xx-tree.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c2410/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/pwm.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/pwm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/fiq_c_isr.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 18 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x.c | 2 |
9 files changed, 13 insertions, 29 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile index 2a12a6a67b2..6c537ecb1af 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o obj-$(CONFIG_CPU_S3C2410_DMA) += dma.o obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o obj-$(CONFIG_S3C2410_GPIO) += gpio.o -obj-$(CONFIG_S3C2410_CLOCK) += clock.o +#obj-$(CONFIG_S3C2410_CLOCK) += clock.o obj-$(CONFIG_S3C2410_PWM) += pwm.o # Machine support diff --git a/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h index 8f7744eab63..e74aa2ccc40 100644 --- a/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h +++ b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h @@ -17,7 +17,7 @@ */ #include <mach/pwm.h> -#include <asm/plat-s3c/regs-timer.h> +#include <plat/regs-timer.h> extern u8 fiq_ready; diff --git a/arch/arm/mach-s3c2410/include/mach/pwm.h b/arch/arm/mach-s3c2410/include/mach/pwm.h index 5689ce973d2..4e3a298f407 100644 --- a/arch/arm/mach-s3c2410/include/mach/pwm.h +++ b/arch/arm/mach-s3c2410/include/mach/pwm.h @@ -8,7 +8,7 @@ #include <mach/io.h> #include <mach/hardware.h> #include <asm/mach-types.h> -#include <asm/plat-s3c/regs-timer.h> +#include <plat/regs-timer.h> #include <mach/gta01.h> enum pwm_timer { diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c index d6780841c69..9528d7aab63 100644 --- a/arch/arm/mach-s3c2410/pwm.c +++ b/arch/arm/mach-s3c2410/pwm.c @@ -22,7 +22,7 @@ #include <linux/clk.h> #include <linux/device.h> #include <mach/hardware.h> -#include <asm/plat-s3c/regs-timer.h> +#include <plat/regs-timer.h> #include <mach/pwm.h> #include <asm/io.h> diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c index 3db402748f6..924f1f926cf 100644 --- a/arch/arm/mach-s3c2440/fiq_c_isr.c +++ b/arch/arm/mach-s3c2440/fiq_c_isr.c @@ -16,11 +16,11 @@ #include <asm/io.h> -#include <asm/plat-s3c24xx/cpu.h> -#include <asm/plat-s3c24xx/irq.h> +#include <plat/cpu.h> +#include <plat/irq.h> #include <mach/pwm.h> -#include <asm/plat-s3c/regs-timer.h> +#include <plat/regs-timer.h> /* * Major Caveats for using FIQ diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index db0965dd064..ba9afb870a6 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -70,11 +70,11 @@ #include <mach/gta02.h> -#include <asm/plat-s3c/regs-serial.h> +#include <plat/regs-serial.h> #include <asm/plat-s3c/nand.h> #include <asm/plat-s3c24xx/devs.h> -#include <asm/plat-s3c24xx/cpu.h> -#include <asm/plat-s3c24xx/pm.h> +#include <plat/cpu.h> +#include <plat/pm.h> #include <asm/plat-s3c24xx/udc.h> #include <asm/plat-s3c24xx/neo1973.h> #include <mach/neo1973-pm-gsm.h> diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index 8d8cb268740..c340cb43f18 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c @@ -170,24 +170,6 @@ static struct map_desc s3c_iodesc[] __initdata = { }; /* read cpu identificaiton code */ -static struct cpu_table * __init -s3c_lookup_cpu(unsigned long idcode) -{ - struct cpu_table *tab; - int count; - - tab = cpu_ids; - for (count = 0; count < ARRAY_SIZE(cpu_ids); count++, tab++) { - if ((idcode & tab->idmask) == tab->idcode) - return tab; - } - - return NULL; -} - -/* cpu information */ - -static struct cpu_table *cpu; static unsigned long s3c24xx_read_idcode_v5(void) { diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index b689cf464c7..6cc157cf655 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c @@ -26,7 +26,7 @@ #include <asm/mach/irq.h> #include <mach/fb.h> #include <mach/hardware.h> -#include <asm/arch-s3c2410/ts.h> +#include <mach/ts.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index d306885807d..df78a15a80b 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c @@ -59,6 +59,8 @@ void __init s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no) s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no); } +extern struct platform_device s3c_device_ts; + void __init s3c244x_map_io(void) { /* register our io-tables */ |