aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/common-smdk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-15 19:01:39 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-15 19:01:39 -0400
commit63d39fe88ffabbd82d9db42e9b603c58532fc918 (patch)
treebaa66eed1709d85406bc476cb468204968b5b512 /arch/arm/mach-s3c2410/common-smdk.c
parent2c5362007bc0a46461a9d94958cdd53bb027004c (diff)
parent463b158aab247b600e4e93614b7b8f42a66331c9 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3477/1: ARM EABI: undefine removed syscalls [ARM] 3475/1: S3C2410: fix spelling mistake in SMDK partition table [ARM] 3474/1: S3C2440: USB rate writes wrong var to CLKDIVN
Diffstat (limited to 'arch/arm/mach-s3c2410/common-smdk.c')
-rw-r--r--arch/arm/mach-s3c2410/common-smdk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/common-smdk.c b/arch/arm/mach-s3c2410/common-smdk.c
index f372fbda124e..c940890f621f 100644
--- a/arch/arm/mach-s3c2410/common-smdk.c
+++ b/arch/arm/mach-s3c2410/common-smdk.c
@@ -50,7 +50,7 @@ static struct mtd_partition smdk_default_nand_part[] = {
50 .offset = 0, 50 .offset = 0,
51 }, 51 },
52 [1] = { 52 [1] = {
53 .name = "S3C2410 flash parition 1", 53 .name = "S3C2410 flash partition 1",
54 .offset = 0, 54 .offset = 0,
55 .size = SZ_2M, 55 .size = SZ_2M,
56 }, 56 },