aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/mach-anubis.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-08-08 16:10:12 -0400
committerBen Dooks <ben-linux@fluff.org>2008-08-08 16:10:12 -0400
commitaf7a535688a758d15f06a98833e6a143b29af9de (patch)
treebac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-s3c2440/mach-anubis.c
parent0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff)
parentc41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff)
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-anubis.c')
-rw-r--r--arch/arm/mach-s3c2440/mach-anubis.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index 0c33a932d65c..441f4bc09472 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -27,19 +27,19 @@
27#include <asm/mach/map.h> 27#include <asm/mach/map.h>
28#include <asm/mach/irq.h> 28#include <asm/mach/irq.h>
29 29
30#include <asm/arch/anubis-map.h> 30#include <mach/anubis-map.h>
31#include <asm/arch/anubis-irq.h> 31#include <mach/anubis-irq.h>
32#include <asm/arch/anubis-cpld.h> 32#include <mach/anubis-cpld.h>
33 33
34#include <asm/hardware.h> 34#include <mach/hardware.h>
35#include <asm/io.h> 35#include <asm/io.h>
36#include <asm/irq.h> 36#include <asm/irq.h>
37#include <asm/mach-types.h> 37#include <asm/mach-types.h>
38 38
39#include <asm/plat-s3c/regs-serial.h> 39#include <asm/plat-s3c/regs-serial.h>
40#include <asm/arch/regs-gpio.h> 40#include <mach/regs-gpio.h>
41#include <asm/arch/regs-mem.h> 41#include <mach/regs-mem.h>
42#include <asm/arch/regs-lcd.h> 42#include <mach/regs-lcd.h>
43#include <asm/plat-s3c/nand.h> 43#include <asm/plat-s3c/nand.h>
44 44
45#include <linux/mtd/mtd.h> 45#include <linux/mtd/mtd.h>