diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 15:39:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 15:39:13 -0400 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/plat-s3c24xx/common-smdk.c | |
| parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
| parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/plat-s3c24xx/common-smdk.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 7b44d0c592b5..bcc43f346272 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
| @@ -147,7 +147,7 @@ static struct mtd_partition smdk_default_nand_part[] = { | |||
| 147 | [7] = { | 147 | [7] = { |
| 148 | .name = "S3C2410 flash partition 7", | 148 | .name = "S3C2410 flash partition 7", |
| 149 | .offset = SZ_1M * 48, | 149 | .offset = SZ_1M * 48, |
| 150 | .size = SZ_16M, | 150 | .size = MTDPART_SIZ_FULL, |
| 151 | } | 151 | } |
| 152 | }; | 152 | }; |
| 153 | 153 | ||