12 files changed, 12 insertions, 15 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index ed30699cc635..af76634f8d98 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -671,7 +671,7 @@ config TICKSOURCE_CORETMR
         default y
 endmenu
 
-menu "Clock souce"
+menu "Clock source"
         depends on GENERIC_CLOCKEVENTS
 config CYCLES_CLOCKSOURCE
         bool "CYCLES"
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 1f94784eab6d..694619365265 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -455,7 +455,7 @@ void handle_sec_sci_fault(uint32_t gstat)
                         printk(KERN_DEBUG "sec ack err\n");
                         break;
                 default:
-                        printk(KERN_DEBUG "sec sci unknow err\n");
+                        printk(KERN_DEBUG "sec sci unknown err\n");
                 }
         }
 
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index d163991c5717..2a74777667fd 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -73,7 +73,7 @@ config ATARI_ETHERNEC
           ROM port. The driver works by polling instead of interrupts, so it
           is quite slow.
 
-          This driver also suppports the ethernet part of the NetUSBee ROM
+          This driver also supports the ethernet part of the NetUSBee ROM
           port combined Ethernet/USB adapter.
 
           To compile the actual ethernet driver, choose Y or M in for the NE2000
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index 602866657938..c370426a7322 100644
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
@@ -1,7 +1,7 @@
 if CPU_CAVIUM_OCTEON
 
 config CAVIUM_CN63XXP1
-        bool "Enable CN63XXP1 errata worarounds"
+        bool "Enable CN63XXP1 errata workarounds"
         default "n"
         help
           The CN63XXP1 chip requires build time workarounds to
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
index 8f1866d8124d..468ffa043607 100644
--- a/arch/mips/lantiq/falcon/sysctrl.c
+++ b/arch/mips/lantiq/falcon/sysctrl.c
@@ -221,7 +221,7 @@ void __init ltq_soc_init(void)
                 (request_mem_region(res_sys[2].start,
                                 resource_size(&res_sys[2]),
                                 res_sys[2].name) < 0))
-                pr_err("Failed to request core reources");
+                pr_err("Failed to request core resources");
 
         status_membase = ioremap_nocache(res_status.start,
                                         resource_size(&res_status));
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index 51804b10a036..2b15491de494 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -318,7 +318,7 @@ void __init ltq_soc_init(void)
                                 res_cgu.name) < 0) ||
                 (request_mem_region(res_ebu.start, resource_size(&res_ebu),
                                 res_ebu.name) < 0))
-                pr_err("Failed to request core reources");
+                pr_err("Failed to request core resources");
 
         pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));
         ltq_cgu_membase = ioremap_nocache(res_cgu.start,
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index cb1ef9984069..37fe8e7887e2 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -218,7 +218,7 @@ static int ltq_pci_probe(struct platform_device *pdev)
         res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         if (!res_cfg || !res_bridge) {
-                dev_err(&pdev->dev, "missing memory reources\n");
+                dev_err(&pdev->dev, "missing memory resources\n");
                 return -EINVAL;
         }
 
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index a648de1b1096..4434b54e1d87 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -181,7 +181,7 @@ endmenu
 config SMP
         bool "Symmetric multi-processing support"
         default y
-        depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050
+        depends on MN10300_PROC_MN2WS0050
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, say N. If you have a system with more
diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c
index 21cd48074ec8..9f8c678f0d9a 100644
--- a/arch/powerpc/boot/simpleboot.c
+++ b/arch/powerpc/boot/simpleboot.c
@@ -61,7 +61,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 if (*reg++ != 0)
                         fatal("Memory range is not based at address 0\n");
 
-        /* get the memsize and trucate it to under 4G on 32 bit machines */
+        /* get the memsize and truncate it to under 4G on 32 bit machines */
         memsize64 = 0;
         for (i = 0; i < *ns; i++)
                 memsize64 = (memsize64 << 32) | *reg++;
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index b44eec3e8dbd..4b005ae5dc4b 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -322,7 +322,7 @@ static void opal_handle_message(void)
 
         /* check for errors. */
         if (ret) {
-                pr_warning("%s: Failed to retrive opal message, err=%lld\n",
+                pr_warning("%s: Failed to retrieve opal message, err=%lld\n",
                                 __func__, ret);
                 return;
         }
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 17ee193960a0..34064f50945e 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -126,7 +126,7 @@ static int pseries_remove_mem_node(struct device_node *np)
                 return 0;
 
         /*
-         * Find the bae address and size of the memblock
+         * Find the base address and size of the memblock
          */
         regs = of_get_property(np, "reg", NULL);
         if (!regs)
@@ -200,7 +200,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
 
         /* The first int of the property is the number of lmb's described
          * by the property. This is followed by an array of of_drconf_cell
-         * entries. Get the niumber of entries and skip to the array of
+         * entries. Get the number of entries and skip to the array of
          * of_drconf_cell's.
          */
         entries = be32_to_cpu(*p++);
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 4ac8cae5727c..366e1b599a7b 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -22,17 +22,14 @@ choice
 config ARCH_SCORE7
         bool "SCORE7 processor"
         select SYS_SUPPORTS_32BIT_KERNEL
-        select GENERIC_HAS_IOMAP
 
 config MACH_SPCT6600
         bool "SPCT6600 series based machines"
         select SYS_SUPPORTS_32BIT_KERNEL
-        select GENERIC_HAS_IOMAP
 
 config SCORE_SIM
         bool "Score simulator"
         select SYS_SUPPORTS_32BIT_KERNEL
-        select GENERIC_HAS_IOMAP
 endchoice
 
 endmenu