diff options
Diffstat (limited to 'arch/arm/mach-at91/board-usb-a9263.c')
-rw-r--r-- | arch/arm/mach-at91/board-usb-a9263.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c index 673e5c27214d..391b566c4571 100644 --- a/arch/arm/mach-at91/board-usb-a9263.c +++ b/arch/arm/mach-at91/board-usb-a9263.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/gpio_keys.h> | 29 | #include <linux/gpio_keys.h> |
30 | #include <linux/input.h> | 30 | #include <linux/input.h> |
31 | 31 | ||
32 | #include <mach/hardware.h> | ||
33 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
34 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
35 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
@@ -38,6 +37,7 @@ | |||
38 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
39 | #include <asm/mach/irq.h> | 38 | #include <asm/mach/irq.h> |
40 | 39 | ||
40 | #include <mach/hardware.h> | ||
41 | #include <mach/board.h> | 41 | #include <mach/board.h> |
42 | #include <mach/gpio.h> | 42 | #include <mach/gpio.h> |
43 | #include <mach/at91_shdwc.h> | 43 | #include <mach/at91_shdwc.h> |
@@ -106,18 +106,18 @@ static struct at91_eth_data __initdata ek_macb_data = { | |||
106 | static struct mtd_partition __initdata ek_nand_partition[] = { | 106 | static struct mtd_partition __initdata ek_nand_partition[] = { |
107 | { | 107 | { |
108 | .name = "Linux Kernel", | 108 | .name = "Linux Kernel", |
109 | .offset = 0x00000000, | 109 | .offset = 0, |
110 | .size = 16 * 1024 * 1024, | 110 | .size = SZ_16M, |
111 | }, | 111 | }, |
112 | { | 112 | { |
113 | .name = "Root FS", | 113 | .name = "Root FS", |
114 | .offset = 0x01000000, | 114 | .offset = MTDPART_OFS_NXTBLK, |
115 | .size = 120 * 1024 * 1024, | 115 | .size = 120 * SZ_1M, |
116 | }, | 116 | }, |
117 | { | 117 | { |
118 | .name = "FS", | 118 | .name = "FS", |
119 | .offset = 0x08800000, | 119 | .offset = MTDPART_OFS_NXTBLK, |
120 | .size = 120 * 1024 * 1024, | 120 | .size = 120 * SZ_1M, |
121 | } | 121 | } |
122 | }; | 122 | }; |
123 | 123 | ||