diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/mach-s3c2443/s3c2443.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/mach-s3c2443/s3c2443.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/s3c2443.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c index c973b68cc735..bbeddf9ddcb1 100644 --- a/arch/arm/mach-s3c2443/s3c2443.c +++ b/arch/arm/mach-s3c2443/s3c2443.c | |||
| @@ -32,9 +32,9 @@ | |||
| 32 | #include <mach/regs-s3c2443-clock.h> | 32 | #include <mach/regs-s3c2443-clock.h> |
| 33 | #include <mach/reset.h> | 33 | #include <mach/reset.h> |
| 34 | 34 | ||
| 35 | #include <asm/plat-s3c24xx/s3c2443.h> | 35 | #include <plat/s3c2443.h> |
| 36 | #include <asm/plat-s3c24xx/devs.h> | 36 | #include <plat/devs.h> |
| 37 | #include <asm/plat-s3c24xx/cpu.h> | 37 | #include <plat/cpu.h> |
| 38 | 38 | ||
| 39 | static struct map_desc s3c2443_iodesc[] __initdata = { | 39 | static struct map_desc s3c2443_iodesc[] __initdata = { |
| 40 | IODESC_ENT(WATCHDOG), | 40 | IODESC_ENT(WATCHDOG), |