diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 03:08:29 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 03:08:29 -0400 |
| commit | 7684f784b08f0b1568567ff5f23cf0f5dff86be5 (patch) | |
| tree | 13ed8e6ccb008cb79f3a6d03cc46c7b2c0b91d5e /arch/arm/plat-s3c24xx | |
| parent | 05daf079259c7e5393f204503284ee90072cb348 (diff) | |
| parent | 6436b6a7a64f946c5a5f3d8a8c0e6404e2bda8d5 (diff) | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/plat-s3c24xx')
| -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 | ||