diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:31:58 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:31:58 +0200 |
commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /arch/arm/mach-at91/board-sam9-l9260.c | |
parent | Merge branch 'ptebits' into devel (diff) | |
parent | [ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c (diff) | |
download | linux-9e165acf1b9e37af7c0fa39399b43d0bd8600039.tar.xz linux-9e165acf1b9e37af7c0fa39399b43d0bd8600039.zip |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/board-sam9-l9260.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9-l9260.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c index e4910cb26c16..99bb4cc23a09 100644 --- a/arch/arm/mach-at91/board-sam9-l9260.c +++ b/arch/arm/mach-at91/board-sam9-l9260.c @@ -126,11 +126,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = { { .name = "Bootloader Area", .offset = 0, - .size = 10 * 1024 * 1024, + .size = 10 * SZ_1M, }, { .name = "User Area", - .offset = 10 * 1024 * 1024, + .offset = MTDPART_OFS_NXTBLK, .size = MTDPART_SIZ_FULL, }, }; |