Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / shannon.c

diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 8acab7b1e4c268ea30143d7f41c56e3b709fe6fa..ddd917d1083d79c4d04da6d2ced5248322672e3b 100644 (file)
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -9,7 +9,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 
@@ -17,8 +17,8 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/arch/mcp.h>
-#include <asm/arch/shannon.h>
+#include <mach/mcp.h>
+#include <mach/shannon.h>
 
 #include "generic.h"
 
@@ -33,7 +33,7 @@ static struct mtd_partition shannon_partitions[] = {
                .offset         = MTDPART_OFS_APPEND,
                .size           = 0xe0000
        },
-       { 
+       {
                .name           = "initrd",
                .offset         = MTDPART_OFS_APPEND,   
                .size           = MTDPART_SIZ_FULL