3 files changed, 13 insertions, 3 deletions

diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c
index 1781b8f342c4..bfe47bd6e50c 100644
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
@@ -194,13 +194,23 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {}
 #if defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
 static struct at91_cf_data cf_data;
 
+static struct resource at91_cf_resources[] = {
+        [0] = {
+                .start  = AT91_CF_BASE,
+                /* ties up CS4, CS5, and CS6 */
+                .end    = AT91_CF_BASE + (0x30000000 - 1),
+                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8AND16BIT,
+        },
+};
+
 static struct platform_device at91rm9200_cf_device = {
         .name           = "at91_cf",
         .id             = -1,
         .dev            = {
                                 .platform_data          = &cf_data,
         },
-        .num_resources  = 0,
+        .resource       = at91_cf_resources,
+        .num_resources  = ARRAY_SIZE(at91_cf_resources),
 };
 
 void __init at91_add_device_cf(struct at91_cf_data *data)
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[] = {
                 .offset = 0,
         },
         [1] = {
-                .name   = "S3C2410 flash parition 1",
+                .name   = "S3C2410 flash partition 1",
                 .offset = 0,
                 .size   = SZ_2M,
         },
diff --git a/arch/arm/mach-s3c2410/s3c2440-clock.c b/arch/arm/mach-s3c2410/s3c2440-clock.c
index 57a15974d4b5..d7a30ed6c327 100644
--- a/arch/arm/mach-s3c2410/s3c2440-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2440-clock.c
@@ -139,7 +139,7 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
 
                 clkdivn = __raw_readl(S3C2410_CLKDIVN);
                 clkdivn |= S3C2440_CLKDIVN_UCLK;
-                __raw_writel(camdivn, S3C2410_CLKDIVN);
+                __raw_writel(clkdivn, S3C2410_CLKDIVN);
 
                 mutex_unlock(&clocks_mutex);
         }