diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /arch/arm/mach-s3c2412/s3c2412.c | |
parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2412/s3c2412.c')
-rw-r--r-- | arch/arm/mach-s3c2412/s3c2412.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 313759c3da69..a086818e117e 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <mach/regs-gpio.h> | 39 | #include <mach/regs-gpio.h> |
40 | #include <mach/regs-gpioj.h> | 40 | #include <mach/regs-gpioj.h> |
41 | #include <mach/regs-dsc.h> | 41 | #include <mach/regs-dsc.h> |
42 | #include <asm/plat-s3c24xx/regs-spi.h> | 42 | #include <plat/regs-spi.h> |
43 | #include <mach/regs-s3c2412.h> | 43 | #include <mach/regs-s3c2412.h> |
44 | 44 | ||
45 | #include <plat/s3c2412.h> | 45 | #include <plat/s3c2412.h> |