diff options
author | Ben Dooks <ben-linux@fluff.org> | 2006-12-17 17:32:21 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-17 18:38:03 -0500 |
commit | 994adcc36d8c2133fce01f4d3fe4e41007555913 (patch) | |
tree | 81eefd4be43925f6a42b5dde9a0405b075b9b9cb | |
parent | 92211ac71e189942968af57e5d0aed30083760ef (diff) |
[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
Clean the includes in arch/arm/mach-s3c2410/s3c2440.c
and arch/arm/mach-s3c2410/s3c2442.c which should have
been pruned when these where split and updated.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2440.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2440.h | 11 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2442.c | 19 |
3 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c index b91b11437449..344eb27cca48 100644 --- a/arch/arm/mach-s3c2410/s3c2440.c +++ b/arch/arm/mach-s3c2410/s3c2440.c | |||
@@ -29,17 +29,9 @@ | |||
29 | #include <asm/io.h> | 29 | #include <asm/io.h> |
30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
31 | 31 | ||
32 | #include <asm/arch/regs-clock.h> | ||
33 | #include <asm/arch/regs-serial.h> | ||
34 | #include <asm/arch/regs-gpio.h> | ||
35 | #include <asm/arch/regs-gpioj.h> | ||
36 | #include <asm/arch/regs-dsc.h> | ||
37 | |||
38 | #include "s3c2440.h" | 32 | #include "s3c2440.h" |
39 | #include "clock.h" | ||
40 | #include "devs.h" | 33 | #include "devs.h" |
41 | #include "cpu.h" | 34 | #include "cpu.h" |
42 | #include "pm.h" | ||
43 | 35 | ||
44 | static struct sys_device s3c2440_sysdev = { | 36 | static struct sys_device s3c2440_sysdev = { |
45 | .cls = &s3c2440_sysclass, | 37 | .cls = &s3c2440_sysclass, |
diff --git a/arch/arm/mach-s3c2410/s3c2440.h b/arch/arm/mach-s3c2410/s3c2440.h index a75616f0d3fa..dcd316076c59 100644 --- a/arch/arm/mach-s3c2410/s3c2440.h +++ b/arch/arm/mach-s3c2410/s3c2440.h | |||
@@ -11,18 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifdef CONFIG_CPU_S3C2440 | 13 | #ifdef CONFIG_CPU_S3C2440 |
14 | |||
15 | extern int s3c2440_init(void); | 14 | extern int s3c2440_init(void); |
16 | |||
17 | extern void s3c2440_map_io(struct map_desc *mach_desc, int size); | ||
18 | |||
19 | extern void s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no); | ||
20 | |||
21 | extern void s3c2440_init_clocks(int xtal); | ||
22 | |||
23 | #else | 15 | #else |
24 | #define s3c2440_init_clocks NULL | ||
25 | #define s3c2440_init_uarts NULL | ||
26 | #define s3c2440_map_io NULL | ||
27 | #define s3c2440_init NULL | 16 | #define s3c2440_init NULL |
28 | #endif | 17 | #endif |
diff --git a/arch/arm/mach-s3c2410/s3c2442.c b/arch/arm/mach-s3c2410/s3c2442.c index e593cb058b16..428732ee68c4 100644 --- a/arch/arm/mach-s3c2410/s3c2442.c +++ b/arch/arm/mach-s3c2410/s3c2442.c | |||
@@ -16,30 +16,11 @@ | |||
16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
17 | #include <linux/timer.h> | 17 | #include <linux/timer.h> |
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/platform_device.h> | ||
20 | #include <linux/serial_core.h> | 19 | #include <linux/serial_core.h> |
21 | #include <linux/sysdev.h> | 20 | #include <linux/sysdev.h> |
22 | #include <linux/clk.h> | ||
23 | |||
24 | #include <asm/mach/arch.h> | ||
25 | #include <asm/mach/map.h> | ||
26 | #include <asm/mach/irq.h> | ||
27 | |||
28 | #include <asm/hardware.h> | ||
29 | #include <asm/io.h> | ||
30 | #include <asm/irq.h> | ||
31 | |||
32 | #include <asm/arch/regs-clock.h> | ||
33 | #include <asm/arch/regs-serial.h> | ||
34 | #include <asm/arch/regs-gpio.h> | ||
35 | #include <asm/arch/regs-gpioj.h> | ||
36 | #include <asm/arch/regs-dsc.h> | ||
37 | 21 | ||
38 | #include "s3c2442.h" | 22 | #include "s3c2442.h" |
39 | #include "clock.h" | ||
40 | #include "devs.h" | ||
41 | #include "cpu.h" | 23 | #include "cpu.h" |
42 | #include "pm.h" | ||
43 | 24 | ||
44 | static struct sys_device s3c2442_sysdev = { | 25 | static struct sys_device s3c2442_sysdev = { |
45 | .cls = &s3c2442_sysclass, | 26 | .cls = &s3c2442_sysclass, |