1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c
index f9d0b65da40b..7c350357333a 100644
--- a/arch/arm/mach-at91/board-usb-a9260.c
+++ b/arch/arm/mach-at91/board-usb-a9260.c
@@ -30,7 +30,6 @@
 #include <linux/input.h>
 #include <linux/clk.h>
 
-#include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -39,6 +38,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91_shdwc.h>
@@ -93,18 +93,18 @@ static struct at91_eth_data __initdata ek_macb_data = {
 static struct mtd_partition __initdata ek_nand_partition[] = {
         {
                 .name   = "Uboot & Kernel",
-                .offset = 0x00000000,
-                .size   = 16 * 1024 * 1024,
+                .offset = 0,
+                .size   = SZ_16M,
         },
         {
                 .name   = "Root FS",
-                .offset = 0x01000000,
-                .size   = 120 * 1024 * 1024,
+                .offset = MTDPART_OFS_NXTBLK,
+                .size   = 120 * SZ_1M,
         },
         {
                 .name   = "FS",
-                .offset = 0x08800000,
-                .size   = 120 * 1024 * 1024,
+                .offset = MTDPART_OFS_NXTBLK,
+                .size   = 120 * SZ_1M,
         }
 };