diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /arch/arm/mach-s3c2443/s3c2443.c | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
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 c973b68cc73..bbeddf9ddcb 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), |