diff --git a/[refs] b/[refs] index 27fdb6527fae..76aa5e3a0105 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f6e439c12646c4631d543d9b49092a396a949c5 +refs/heads/master: f6835543440c85f20c86c5b006e8404fe6a78109 diff --git a/trunk/arch/arm/mach-s3c2410/common-smdk.c b/trunk/arch/arm/mach-s3c2410/common-smdk.c index f372fbda124e..c940890f621f 100644 --- a/trunk/arch/arm/mach-s3c2410/common-smdk.c +++ b/trunk/arch/arm/mach-s3c2410/common-smdk.c @@ -50,7 +50,7 @@ static struct mtd_partition smdk_default_nand_part[] = { .offset = 0, }, [1] = { - .name = "S3C2410 flash parition 1", + .name = "S3C2410 flash partition 1", .offset = 0, .size = SZ_2M, },