diff options
Diffstat (limited to 'arch/arm/mach-at91/board-sam9261ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9261ek.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index 1a9963b811c7..03d3382cfef6 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include <video/atmel_lcdc.h> | 36 | #include <video/atmel_lcdc.h> |
37 | 37 | ||
38 | #include <mach/hardware.h> | ||
39 | #include <asm/setup.h> | 38 | #include <asm/setup.h> |
40 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |
41 | #include <asm/irq.h> | 40 | #include <asm/irq.h> |
@@ -44,6 +43,7 @@ | |||
44 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
45 | #include <asm/mach/irq.h> | 44 | #include <asm/mach/irq.h> |
46 | 45 | ||
46 | #include <mach/hardware.h> | ||
47 | #include <mach/board.h> | 47 | #include <mach/board.h> |
48 | #include <mach/gpio.h> | 48 | #include <mach/gpio.h> |
49 | #include <mach/at91sam9_smc.h> | 49 | #include <mach/at91sam9_smc.h> |
@@ -168,11 +168,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = { | |||
168 | { | 168 | { |
169 | .name = "Partition 1", | 169 | .name = "Partition 1", |
170 | .offset = 0, | 170 | .offset = 0, |
171 | .size = 256 * 1024, | 171 | .size = SZ_256K, |
172 | }, | 172 | }, |
173 | { | 173 | { |
174 | .name = "Partition 2", | 174 | .name = "Partition 2", |
175 | .offset = 256 * 1024 , | 175 | .offset = MTDPART_OFS_NXTBLK, |
176 | .size = MTDPART_SIZ_FULL, | 176 | .size = MTDPART_SIZ_FULL, |
177 | }, | 177 | }, |
178 | }; | 178 | }; |