Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
  trivial: remove the trivial patch monkey's name from SubmittingPatches
  trivial: Fix a typo in comment of addrconf_dad_start()
  trivial: usb: fix missing space typo in doc
  trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
  trivial: Remove the hyphen from git commands
  trivial: fix ETIMEOUT -> ETIMEDOUT typos
  trivial: Kconfig: .ko is normally not included in module names
  trivial: SubmittingPatches: fix typo
  trivial: Documentation/dell_rbu.txt: fix typos
  trivial: Fix Pavel's address in MAINTAINERS
  trivial: ftrace:fix description of trace directory
  trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
  trivial: input/misc: Fix typo in Kconfig
  trivial: fix grammo in bus_for_each_dev() kerneldoc
  trivial: rbtree.txt: fix rb_entry() parameters in sample code
  trivial: spelling fix in ppc code comments
  trivial: fix typo in bio_alloc kernel doc
  trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
  trivial: Miscellaneous documentation typo fixes
  trivial: fix typo milisecond/millisecond for documentation and source comments.
  ...

64 files changed, 96 insertions, 95 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 6273d98d00eb..ac176da1f94e 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -748,9 +748,9 @@ static int ata_acpi_run_tf(struct ata_device *dev,
 /**
  * ata_acpi_exec_tfs - get then write drive taskfile settings
  * @dev: target ATA device
- * @nr_executed: out paramter for the number of executed commands
+ * @nr_executed: out parameter for the number of executed commands
  *
- * Evaluate _GTF and excute returned taskfiles.
+ * Evaluate _GTF and execute returned taskfiles.
  *
  * LOCKING:
  * EH context.
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 94919ad03df1..fa22f94ca415 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2864,7 +2864,7 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
 /**
  *      ata_set_mode - Program timings and issue SET FEATURES - XFER
  *      @link: link on which timings will be programmed
- *      @r_failed_dev: out paramter for failed device
+ *      @r_failed_dev: out parameter for failed device
  *
  *      Set ATA device disk transfer mode (PIO3, UDMA6, etc.).  If
  *      ata_set_mode() fails, pointer to the failing device is
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index c6599618523e..4b04a15146d7 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -279,7 +279,7 @@ static struct device *next_device(struct klist_iter *i)
  *
  * NOTE: The device that returns a non-zero value is not retained
  * in any way, nor is its refcount incremented. If the caller needs
- * to retain this data, it should do, and increment the reference
+ * to retain this data, it should do so, and increment the reference
  * count in the supplied callback.
  */
 int bus_for_each_dev(struct bus_type *bus, struct device *start,
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ac5e05a98b2f..bb72ada9f074 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -112,7 +112,7 @@ config GDROM
           with up to 1 GB of data. This drive will also read standard CD ROM
           disks. Select this option to access any disks in your GD ROM drive.
           Most users will want to say "Y" here.
-          You can also build this as a module which will be called gdrom.ko
+          You can also build this as a module which will be called gdrom.
 
 source "drivers/block/paride/Kconfig"
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b1e9652c0d9d..30bae6de6a0d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -692,7 +692,7 @@ config HVCS
           this driver.
 
           To compile this driver as a module, choose M here: the
-          module will be called hvcs.ko.  Additionally, this module
+          module will be called hvcs.  Additionally, this module
           will depend on arch specific APIs exported from hvcserver.ko
           which will also be compiled when this driver is built as a
           module.
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index fd3ebd1be570..72429b6b2fa8 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -779,7 +779,7 @@ static void change_speed(struct async_struct *info,
                 info->IER |= UART_IER_MSI;
         }
         /* TBD:
-         * Does clearing IER_MSI imply that we should disbale the VBL interrupt ?
+         * Does clearing IER_MSI imply that we should disable the VBL interrupt ?
          */
 
         /*
diff --git a/drivers/connector/Kconfig b/drivers/connector/Kconfig
index 100bfd422066..6e6730f9dfd1 100644
--- a/drivers/connector/Kconfig
+++ b/drivers/connector/Kconfig
@@ -7,7 +7,7 @@ menuconfig CONNECTOR
           of the netlink socket protocol.
 
           Connector support can also be built as a module.  If so, the module
-          will be called cn.ko.
+          will be called cn.
 
 if CONNECTOR
 
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index e748e55bd86b..5b27692372bf 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -34,7 +34,7 @@ config CRYPTO_DEV_PADLOCK_AES
           Available in VIA C3 and newer CPUs.
 
           If unsure say M. The compiled module will be
-          called padlock-aes.ko
+          called padlock-aes.
 
 config CRYPTO_DEV_PADLOCK_SHA
         tristate "PadLock driver for SHA1 and SHA256 algorithms"
@@ -47,7 +47,7 @@ config CRYPTO_DEV_PADLOCK_SHA
           Available in VIA C7 and newer processors.
 
           If unsure say M. The compiled module will be
-          called padlock-sha.ko
+          called padlock-sha.
 
 config CRYPTO_DEV_GEODE
         tristate "Support for the Geode LX AES engine"
@@ -79,7 +79,7 @@ config ZCRYPT_MONOLITHIC
         bool "Monolithic zcrypt module"
         depends on ZCRYPT="m"
         help
-          Select this option if you want to have a single module z90crypt.ko
+          Select this option if you want to have a single module z90crypt,
           that contains all parts of the crypto device driver (ap bus,
           request router and all the card drivers).
 
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index facfdb1fa71c..d205d493a68a 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -1084,7 +1084,7 @@ static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt)
         struct pci_dev *dev = pvt->dev_d0f1;
         int enable = 1;
 
-        /* Allow module paramter override, else see if CPU supports parity */
+        /* Allow module parameter override, else see if CPU supports parity */
         if (sysbus_parity != -1) {
                 enable = sysbus_parity;
         } else if (cpu_id[0] &&
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index cf06494bb744..9a5d0aaac9d0 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -46,7 +46,7 @@ menuconfig IDE
           SMART parameters from disk drives.
 
           To compile this driver as a module, choose M here: the
-          module will be called ide-core.ko.
+          module will be called ide-core.
 
           For further information, please read <file:Documentation/ide/ide.txt>.
 
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index bbdd2547f12a..702ef64a0f12 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -577,7 +577,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
 
                 /*
                  * If necessary schedule the packet transfer to occur 'timeout'
-                 * miliseconds later in ide_delayed_transfer_pc() after the
+                 * milliseconds later in ide_delayed_transfer_pc() after the
                  * device says it's ready for a packet.
                  */
                 if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) {
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 5c0a631d1455..06f46fcc0772 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -232,7 +232,7 @@ config INPUT_GPIO_ROTARY_ENCODER
         depends on GPIOLIB && GENERIC_GPIO
         help
           Say Y here to add support for rotary encoders connected to GPIO lines.
-          Check file:Documentation/incput/rotary_encoder.txt for more
+          Check file:Documentation/input/rotary-encoder.txt for more
           information.
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index 7d97d54588d9..77e9fdda0597 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -183,7 +183,7 @@ int cf_command(int drvid, int mode,
           (mode != 1) ? "" : " 0 ",
           (mode != 1) ? "" : fwd_nr);
  
-  retval = divert_if.ll_cmd(&cs->ics); /* excute command */
+  retval = divert_if.ll_cmd(&cs->ics); /* execute command */
 
   if (!retval)
    { cs->prev = NULL;
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 3083338716b2..47dbfe298b43 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -502,7 +502,7 @@ tone_off:
                         break;
                 }
                 dsp->cmx_delay = (*((int *)data)) << 3;
-                        /* miliseconds to samples */
+                        /* milliseconds to samples */
                 if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1))
                         /* clip to half of maximum usable buffer
                         (half of half buffer) */
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 60955a70d880..1bb66e1ed5a7 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -216,7 +216,7 @@ config DVB_USB_TTUSB2
         help
           Say Y here to support the Pinnacle 400e DVB-S USB2.0 receiver. The
           firmware protocol used by this module is similar to the one used by the
-          old ttusb-driver - that's why the module is called dvb-usb-ttusb2.ko.
+          old ttusb-driver - that's why the module is called dvb-usb-ttusb2.
 
 config DVB_USB_DTT200U
         tristate "WideView WT-200U and WT-220U (pen) DVB-T USB2.0 support (Yakumo/Hama/Typhoon/Yuan)"
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index 3e6ffee8dfed..ccd47f57f42c 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -181,7 +181,7 @@ static int hdpvr_submit_buffers(struct hdpvr_device *dev)
                                  buff_list);
                 if (buf->status != BUFSTAT_AVAILABLE) {
                         v4l2_err(&dev->v4l2_dev,
-                                 "buffer not marked as availbale\n");
+                                 "buffer not marked as available\n");
                         ret = -EFAULT;
                         goto err;
                 }
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt
index 693e4b511354..fa9249b4971a 100644
--- a/drivers/message/fusion/lsi/mpi_history.txt
+++ b/drivers/message/fusion/lsi/mpi_history.txt
@@ -130,7 +130,7 @@ mpi_ioc.h
  *  08-08-01  01.02.01  Original release for v1.2 work.
  *                      New format for FWVersion and ProductId in
  *                      MSG_IOC_FACTS_REPLY and MPI_FW_HEADER.
- *  08-31-01  01.02.02  Addded event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and
+ *  08-31-01  01.02.02  Added event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and
  *                      related structure and defines.
  *                      Added event MPI_EVENT_ON_BUS_TIMER_EXPIRED.
  *                      Added MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE.
@@ -190,7 +190,7 @@ mpi_ioc.h
  *  10-11-06  01.05.12  Added MPI_IOCFACTS_EXCEPT_METADATA_UNSUPPORTED.
  *                      Added MaxInitiators field to PortFacts reply.
  *                      Added SAS Device Status Change ReasonCode for
- *                      asynchronous notificaiton.
+ *                      asynchronous notification.
  *                      Added MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE and event
  *                      data structure.
  *                      Added new ImageType values for FWDownload and FWUpload
@@ -623,7 +623,7 @@ mpi_fc.h
  *  11-02-00  01.01.01  Original release for post 1.0 work
  *  12-04-00  01.01.02  Added messages for Common Transport Send and
  *                      Primitive Send.
- *  01-09-01  01.01.03  Modifed some of the new flags to have an MPI prefix
+ *  01-09-01  01.01.03  Modified some of the new flags to have an MPI prefix
  *                      and modified the FcPrimitiveSend flags.
  *  01-25-01  01.01.04  Move InitiatorIndex in LinkServiceRsp reply to a larger
  *                      field.
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 7d04fb9ddcaa..b8e35a0b4d72 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -154,7 +154,8 @@ config MTD_AFS_PARTS
 
           You will still need the parsing functions to be called by the driver
           for your particular device. It won't happen automatically. The
-          'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
+          'armflash' map driver (CONFIG_MTD_ARM_INTEGRATOR) does this, for
+          example.
 
 config MTD_OF_PARTS
         tristate "Flash partition map based on OF description"
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 6fde0a2e3567..325fab92a62c 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -49,7 +49,7 @@ config MTD_MS02NV
           If you want to compile this driver as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt>.
-          The module will be called ms02-nv.ko.
+          The module will be called ms02-nv.
 
 config MTD_DATAFLASH
         tristate "Support for AT45xxx DataFlash"
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 890936d0275e..f3276897859e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -260,7 +260,7 @@ config MTD_NAND_BASLER_EXCITE
         help
           This enables the driver for the NAND flash device found on the
           Basler eXcite Smart Camera. If built as a module, the driver
-          will be named "excite_nandflash.ko".
+          will be named excite_nandflash.
 
 config MTD_NAND_CAFE
         tristate "NAND support for OLPC CAFÉ chip"
@@ -282,7 +282,7 @@ config MTD_NAND_CS553X
           controller is enabled for NAND, and currently requires that
           the controller be in MMIO mode.
 
-          If you say "m", the module will be called "cs553x_nand.ko".
+          If you say "m", the module will be called cs553x_nand.
 
 config MTD_NAND_ATMEL
         tristate "Support for NAND Flash / SmartMedia on AT91 and AVR32"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f3c4a3b910bb..3111b6c7cbc3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1880,7 +1880,7 @@ config FEC_MPC52xx
         ---help---
           This option enables support for the MPC5200's on-chip
           Fast Ethernet Controller
-          If compiled as module, it will be called 'fec_mpc52xx.ko'.
+          If compiled as module, it will be called fec_mpc52xx.
 
 config FEC_MPC52xx_MDIO
         bool "MPC52xx FEC MDIO bus driver"
@@ -1892,7 +1892,7 @@ config FEC_MPC52xx_MDIO
           (Motorola? industry standard).
           If your board uses an external PHY connected to FEC, enable this.
           If not sure, enable.
-          If compiled as module, it will be called 'fec_mpc52xx_phy.ko'.
+          If compiled as module, it will be called fec_mpc52xx_phy.
 
 config NE_H8300
         tristate "NE2000 compatible support for H8/300"
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 78cc71469136..b642647170be 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1220,7 +1220,7 @@ static int __init ltpc_setup(char *str)
                 if (ints[0] > 2) {
                         dma = ints[3];
                 }
-                /* ignore any other paramters */
+                /* ignore any other parameters */
         }
         return 1;
 }
diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index e678498de6db..d24158e7f309 100644
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -97,7 +97,7 @@
 #define B44_DMARX_STAT  0x021CUL /* DMA RX Current Active Desc. + Status */
 #define  DMARX_STAT_CDMASK      0x00000fff /* Current Descriptor Mask */
 #define  DMARX_STAT_SMASK       0x0000f000 /* State Mask */
-#define  DMARX_STAT_SDISABLED   0x00000000 /* State Disbaled */
+#define  DMARX_STAT_SDISABLED   0x00000000 /* State Disabled */
 #define  DMARX_STAT_SACTIVE     0x00001000 /* State Active */
 #define  DMARX_STAT_SIDLE       0x00002000 /* State Idle Wait */
 #define  DMARX_STAT_SSTOPPED    0x00003000 /* State Stopped */
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 0f9ee1348552..af5364f49550 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2785,7 +2785,7 @@ static int e100_resume(struct pci_dev *pdev)
         /* ack any pending wake events, disable PME */
         pci_enable_wake(pdev, 0, 0);
 
-        /* disbale reverse auto-negotiation */
+        /* disable reverse auto-negotiation */
         if (nic->phy == phy_82552_v) {
                 u16 smartspeed = mdio_read(netdev, nic->mii.phy_id,
                                            E100_82552_SMARTSPEED);
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index f37360aa12a8..44f0bf23dafc 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -62,7 +62,7 @@ struct e1000_info;
         e_printk(KERN_NOTICE, adapter, format, ## arg)
 
 
-/* Interrupt modes, as used by the IntMode paramter */
+/* Interrupt modes, as used by the IntMode parameter */
 #define E1000E_INT_MODE_LEGACY          0
 #define E1000E_INT_MODE_MSI             1
 #define E1000E_INT_MODE_MSIX            2
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 16a41389575a..78952f8324e2 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -268,7 +268,7 @@ struct ehea_qp_init_attr {
 };
 
 /*
- * Event Queue attributes, passed as paramter
+ * Event Queue attributes, passed as parameter
  */
 struct ehea_eq_attr {
         u32 type;
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
index 4bff35e46871..d488733893a6 100644
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/igbvf/igbvf.h
@@ -45,7 +45,7 @@ struct igbvf_adapter;
 /* Interrupt defines */
 #define IGBVF_START_ITR                 648 /* ~6000 ints/sec */
 
-/* Interrupt modes, as used by the IntMode paramter */
+/* Interrupt modes, as used by the IntMode parameter */
 #define IGBVF_INT_MODE_LEGACY           0
 #define IGBVF_INT_MODE_MSI              1
 #define IGBVF_INT_MODE_MSIX             2
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h
index dd9318f19497..dfc2541bb556 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -514,7 +514,7 @@ enum ipg_regs {
 #define         IPG_DMALIST_ALIGN_PAD   0x07
 #define         IPG_MULTICAST_HASHTABLE_SIZE    0x40
 
-/* Number of miliseconds to wait after issuing a software reset.
+/* Number of milliseconds to wait after issuing a software reset.
  * 0x05 <= IPG_AC_RESETWAIT to account for proper 10Mbps operation.
  */
 #define         IPG_AC_RESETWAIT             0x05
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 7bcc49de1637..e8eeef0c9c9a 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -371,7 +371,7 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
         int i;
 
         /* If we haven't received a specific coalescing setting
-         * (module param), we set the moderation paramters as follows:
+         * (module param), we set the moderation parameters as follows:
          * - moder_cnt is set to the number of mtu sized packets to
          *   satisfy our coelsing target.
          * - moder_time is set to a fixed value.
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index 8754e44cadae..3bd0b5933d59 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -3242,8 +3242,8 @@ struct niu {
         struct niu_parent               *parent;
 
         u32                             flags;
-#define NIU_FLAGS_HOTPLUG_PHY_PRESENT   0x02000000 /* Removebale PHY detected*/
-#define NIU_FLAGS_HOTPLUG_PHY           0x01000000 /* Removebale PHY */
+#define NIU_FLAGS_HOTPLUG_PHY_PRESENT   0x02000000 /* Removeable PHY detected*/
+#define NIU_FLAGS_HOTPLUG_PHY           0x01000000 /* Removeable PHY */
 #define NIU_FLAGS_VPD_VALID             0x00800000 /* VPD has valid version */
 #define NIU_FLAGS_MSIX                  0x00400000 /* MSI-X in use */
 #define NIU_FLAGS_MCAST                 0x00200000 /* multicast filter enabled */
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index c92ced247947..1fd5ecb24425 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3174,7 +3174,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
 
         if (value & RST_FO_FR) {
                 QPRINTK(qdev, IFDOWN, ERR,
-                        "ETIMEOUT!!! errored out of resetting the chip!\n");
+                        "ETIMEDOUT!!! errored out of resetting the chip!\n");
                 status = -ETIMEDOUT;
         }
 
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index 9f81b797f10b..ac9493f6c1a1 100644
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
@@ -141,7 +141,7 @@ end:
 /* We are being asked by firmware to accept
  * a change to the port.  This is only
  * a change to max frame sizes (Tx/Rx), pause
- * paramters, or loopback mode. We wake up a worker
+ * parameters, or loopback mode. We wake up a worker
  * to handler processing this since a mailbox command
  * will need to be sent to ACK the request.
  */
@@ -371,7 +371,7 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)
         /* We are being asked by firmware to accept
          * a change to the port.  This is only
          * a change to max frame sizes (Tx/Rx), pause
-         * paramters, or loopback mode.
+         * parameters, or loopback mode.
          */
         case AEN_IDC_REQ:
                 status = ql_idc_req_aen(qdev);
@@ -380,7 +380,7 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)
         /* Process and inbound IDC event.
          * This will happen when we're trying to
          * change tx/rx max frame size, change pause
-         * paramters or loopback mode.
+         * parameters or loopback mode.
          */
         case AEN_IDC_CMPLT:
         case AEN_IDC_EXT:
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/skfp/h/smt.h
index 1ff589988d10..2976757a36fb 100644
--- a/drivers/net/skfp/h/smt.h
+++ b/drivers/net/skfp/h/smt.h
@@ -413,7 +413,7 @@ struct smt_p_reason {
 #define SMT_RDF_SUCCESS 0x00000003      /* success (PMF) */
 #define SMT_RDF_BADSET  0x00000004      /* bad set count (PMF) */
 #define SMT_RDF_ILLEGAL 0x00000005      /* read only (PMF) */
-#define SMT_RDF_NOPARAM 0x6             /* paramter not supported (PMF) */
+#define SMT_RDF_NOPARAM 0x6             /* parameter not supported (PMF) */
 #define SMT_RDF_RANGE   0x8             /* out of range */
 #define SMT_RDF_AUTHOR  0x9             /* not autohorized */
 #define SMT_RDF_LENGTH  0x0a            /* length error */
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 534c0f38483c..0337b9d673f4 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ;
 MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver \n") ;
 MODULE_FIRMWARE(FW_NAME);
 
-/* Module paramters */
+/* Module parameters */
 
 /* Ring Speed 0,4,16 
  * 0 = Autosense   
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 2e70ee8f1459..46a2cc92d979 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -169,7 +169,7 @@ static char *open_min_error[] = {
         "Monitor Contention failer for RPL", "FDX Protocol Error"
 };
 
-/* Module paramters */
+/* Module parameters */
 
 /* Ring Speed 0,4,16
  * 0 = Autosense         
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index d068a9d36883..2d819fc85589 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -132,7 +132,7 @@ static char *open_min_error[] = {"No error", "Function Failure", "Signal Lost",
                                    "Reserved", "Reserved", "No Monitor Detected for RPL", 
                                    "Monitor Contention failer for RPL", "FDX Protocol Error"};
 
-/* Module paramters */
+/* Module parameters */
 
 MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; 
 MODULE_DESCRIPTION("Olympic PCI/Cardbus Chipset Driver") ; 
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c
index 6fcb500257bc..61fe80dda3e3 100644
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ucc_geth_ethtool.c
@@ -7,7 +7,7 @@
  *
  * Limitation:
  * Can only get/set setttings of the first queue.
- * Need to re-open the interface manually after changing some paramters.
+ * Need to re-open the interface manually after changing some parameters.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f3a2fce6166c..47f68cfa7e21 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -398,7 +398,7 @@ static void rx_complete (struct urb *urb)
 
         /* stalls need manual reset. this is rare ... except that
          * when going through USB 2.0 TTs, unplug appears this way.
-         * we avoid the highspeed version of the ETIMEOUT/EILSEQ
+         * we avoid the highspeed version of the ETIMEDOUT/EILSEQ
          * storm, recovering as needed.
          */
         case -EPIPE:
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 3d94e7dfea69..3359497012aa 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -310,7 +310,7 @@ config PRISM54
           If you want to compile the driver as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt>.
-          The module will be called prism54.ko.
+          The module will be called prism54.
 
 config USB_ZD1201
         tristate "USB ZD1201 based Wireless device support"
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index 932d207bce23..c15db2293515 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -29,7 +29,7 @@ config HOSTAP
         PLX/PCI/CS version of the driver to actually use the driver.
 
         The driver can be compiled as a module and it will be called
-        "hostap.ko".
+        hostap.
 
 config HOSTAP_FIRMWARE
         bool "Support downloading firmware images with Host AP driver"
@@ -68,7 +68,7 @@ config HOSTAP_PLX
         driver.
 
         The driver can be compiled as a module and will be named
-        "hostap_plx.ko".
+        hostap_plx.
 
 config HOSTAP_PCI
         tristate "Host AP driver for Prism2.5 PCI adaptors"
@@ -81,7 +81,7 @@ config HOSTAP_PCI
         driver.
 
         The driver can be compiled as a module and will be named
-        "hostap_pci.ko".
+        hostap_pci.
 
 config HOSTAP_CS
         tristate "Host AP driver for Prism2/2.5/3 PC Cards"
@@ -94,4 +94,4 @@ config HOSTAP_CS
         driver.
 
         The driver can be compiled as a module and will be named
-        "hostap_cs.ko".
+        hostap_cs.
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 8304f6406a17..736162324ba4 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -75,7 +75,7 @@ config IWLAGN
           If you want to compile the driver as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
-          module will be called iwlagn.ko.
+          module will be called iwlagn.
 
 
 config IWL4965
@@ -113,7 +113,7 @@ config IWL3945
           If you want to compile the driver as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
-          module will be called iwl3945.ko.
+          module will be called iwl3945.
 
 config IWL3945_SPECTRUM_MEASUREMENT
         bool "Enable Spectrum Measurement in iwl3945 driver"
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index bebf735cd4bd..ff0042ffe3e9 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -584,7 +584,7 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
         ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER,
                                                         infobuf, info_len);
         if (ret != 0)
-                devdbg(dev, "setting rndis config paramater failed, %d.", ret);
+                devdbg(dev, "setting rndis config parameter failed, %d.", ret);
 
         kfree(infobuf);
         return ret;
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index bfc5d9cf716e..1ae11c7f17af 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -9,11 +9,11 @@ menuconfig RT2X00
 
           When building one of the individual drivers, the rt2x00 library
           will also be created. That library (when the driver is built as
-          a module) will be called "rt2x00lib.ko".
+          a module) will be called rt2x00lib.
 
           Additionally PCI and USB libraries will also be build depending
           on the types of drivers being selected, these libraries will be
-          called "rt2x00pci.ko" and "rt2x00usb.ko".
+          called rt2x00pci and rt2x00usb.
 
 if RT2X00
 
@@ -26,7 +26,7 @@ config RT2400PCI
           This adds support for rt2400 wireless chipset family.
           Supported chips: RT2460.
 
-          When compiled as a module, this driver will be called "rt2400pci.ko".
+          When compiled as a module, this driver will be called rt2400pci.
 
 config RT2500PCI
         tristate "Ralink rt2500 (PCI/PCMCIA) support"
@@ -37,7 +37,7 @@ config RT2500PCI
           This adds support for rt2500 wireless chipset family.
           Supported chips: RT2560.
 
-          When compiled as a module, this driver will be called "rt2500pci.ko".
+          When compiled as a module, this driver will be called rt2500pci.
 
 config RT61PCI
         tristate "Ralink rt2501/rt61 (PCI/PCMCIA) support"
@@ -51,7 +51,7 @@ config RT61PCI
           This adds support for rt2501 wireless chipset family.
           Supported chips: RT2561, RT2561S & RT2661.
 
-          When compiled as a module, this driver will be called "rt61pci.ko".
+          When compiled as a module, this driver will be called rt61pci.
 
 config RT2500USB
         tristate "Ralink rt2500 (USB) support"
@@ -62,7 +62,7 @@ config RT2500USB
           This adds support for rt2500 wireless chipset family.
           Supported chips: RT2571 & RT2572.
 
-          When compiled as a module, this driver will be called "rt2500usb.ko".
+          When compiled as a module, this driver will be called rt2500usb.
 
 config RT73USB
         tristate "Ralink rt2501/rt73 (USB) support"
@@ -75,7 +75,7 @@ config RT73USB
           This adds support for rt2501 wireless chipset family.
           Supported chips: RT2571W, RT2573 & RT2671.
 
-          When compiled as a module, this driver will be called "rt73usb.ko".
+          When compiled as a module, this driver will be called rt73usb.
 
 config RT2X00_LIB_PCI
         tristate
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index a631613177d0..d83e3794d340 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -235,7 +235,7 @@ void rt2x00link_reset_tuner(struct rt2x00_dev *rt2x00dev, bool antenna);
  * @rt2x00dev: Pointer to &struct rt2x00_dev.
  *
  * Initialize work structure and all link tuning related
- * paramters. This will not start the link tuning process itself.
+ * parameters. This will not start the link tuning process itself.
  */
 void rt2x00link_register(struct rt2x00_dev *rt2x00dev);
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index e55b33961aeb..fa2821be44c2 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -138,7 +138,7 @@ psa_read(struct net_device *	dev,
 
 /*------------------------------------------------------------------*/
 /*
- * Write the Paramter Storage Area to the WaveLAN card's memory
+ * Write the Parameter Storage Area to the WaveLAN card's memory
  */
 static void
 psa_write(struct net_device *   dev,
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 3eee70928d45..2d6da78fddb6 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -679,7 +679,7 @@ alloc_err:
         return rc;
 }
 
-static int sn_pci_hotplug_init(void)
+static int __init sn_pci_hotplug_init(void)
 {
         struct pci_bus *pci_bus = NULL;
         int rc;
@@ -716,7 +716,7 @@ static int sn_pci_hotplug_init(void)
         return registered == 1 ? 0 : -ENODEV;
 }
 
-static void sn_pci_hotplug_exit(void)
+static void __exit sn_pci_hotplug_exit(void)
 {
         struct hotplug_slot *bss_hotplug_slot;
 
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index a7745c82b4ae..cb909a5b5047 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -8,7 +8,7 @@ config LCS
            Select this option if you want to use LCS networking on IBM System z.
            This device driver supports Token Ring (IEEE 802.5),
            FDDI (IEEE 802.7) and Ethernet.
-           To compile as a module, choose M. The module name is lcs.ko.
+           To compile as a module, choose M. The module name is lcs.
            If you do not know what it is, it's safe to choose Y.
 
 config CTCM
@@ -21,7 +21,7 @@ config CTCM
           It also supports virtual CTCs when running under VM.
           This driver also supports channel-to-channel MPC SNA devices.
           MPC is an SNA protocol device used by Communication Server for Linux.
-          To compile as a module, choose M. The module name is ctcm.ko.
+          To compile as a module, choose M. The module name is ctcm.
           To compile into the kernel, choose Y.
           If you do not need any channel-to-channel connection, choose N.
 
@@ -34,7 +34,7 @@ config NETIUCV
           link between VM guests. Using ifconfig a point-to-point connection
           can be established to the Linux on IBM System z
           running on the other VM guest. To compile as a module, choose M.
-          The module name is netiucv.ko. If unsure, choose Y.
+          The module name is netiucv. If unsure, choose Y.
 
 config SMSGIUCV
         tristate "IUCV special message support (VM only)"
@@ -50,7 +50,7 @@ config CLAW
           This driver supports channel attached CLAW devices.
           CLAW is Common Link Access for Workstation.  Common devices
           that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices.
-          To compile as a module, choose M. The module name is claw.ko.
+          To compile as a module, choose M. The module name is claw.
           To compile into the kernel, choose Y.
 
 config QETH
@@ -65,14 +65,14 @@ config QETH
           <http://www.ibm.com/developerworks/linux/linux390>
 
           To compile this driver as a module, choose M.
-          The module name is qeth.ko.
+          The module name is qeth.
 
 config QETH_L2
         tristate "qeth layer 2 device support"
         depends on QETH
         help
           Select this option to be able to run qeth devices in layer 2 mode.
-          To compile as a module, choose M. The module name is qeth_l2.ko.
+          To compile as a module, choose M. The module name is qeth_l2.
           If unsure, choose y.
 
 config QETH_L3
@@ -80,7 +80,7 @@ config QETH_L3
         depends on QETH
         help
           Select this option to be able to run qeth devices in layer 3 mode.
-          To compile as a module choose M. The module name is qeth_l3.ko.
+          To compile as a module choose M. The module name is qeth_l3.
           If unsure, choose Y.
 
 config QETH_IPV6
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index bb2752b4130f..35493a82d2a8 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -116,7 +116,7 @@ static void zfcp_wka_port_put(struct zfcp_wka_port *wka_port)
 {
         if (atomic_dec_return(&wka_port->refcount) != 0)
                 return;
-        /* wait 10 miliseconds, other reqs might pop in */
+        /* wait 10 milliseconds, other reqs might pop in */
         schedule_delayed_work(&wka_port->work, HZ / 100);
 }
 
diff --git a/drivers/scsi/dpt/osd_util.h b/drivers/scsi/dpt/osd_util.h
index 4b56c0436ba2..b2613c2eaac7 100644
--- a/drivers/scsi/dpt/osd_util.h
+++ b/drivers/scsi/dpt/osd_util.h
@@ -342,7 +342,7 @@ uLONG osdGetThreadID(void);
 /* wakes up the specifed thread */
 void osdWakeThread(uLONG);
 
-/* osd sleep for x miliseconds */
+/* osd sleep for x milliseconds */
 void osdSleep(uLONG);
 
 #define DPT_THREAD_PRIORITY_LOWEST 0x00
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index e9fa6762044a..7991ba1980ae 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1174,8 +1174,8 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc)
  * @reftag:         out: ref tag (reference tag)
  *
  * Description:
- *   Extract DIF paramters from the command if possible.  Otherwise,
- *   use default paratmers.
+ *   Extract DIF parameters from the command if possible.  Otherwise,
+ *   use default parameters.
  *
  **/
 static inline void
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 795201fa0b48..512c2cc1a33f 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -469,7 +469,7 @@ typedef struct {
         u8      type;           /* Type of the device */
         u8      cur_status;     /* current status of the device */
         u8      tag_depth;      /* Level of tagging */
-        u8      sync_neg;       /* sync negotiation - ENABLE or DISBALE */
+        u8      sync_neg;       /* sync negotiation - ENABLE or DISABLE */
         u32     size;           /* configurable size in terms of 512 byte
                                    blocks */
 }__attribute__ ((packed)) phys_drv;
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index 170399ef06f4..b25b74764ec3 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -686,7 +686,7 @@ typedef struct {
  * @type        : Type of the device
  * @cur_status  : current status of the device
  * @tag_depth   : Level of tagging
- * @sync_neg    : sync negotiation - ENABLE or DISBALE
+ * @sync_neg    : sync negotiation - ENABLE or DISABLE
  * @size        : configurable size in terms of 512 byte
  */
 typedef struct {
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 641e800ed693..1132c5cae7ab 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -861,7 +861,7 @@ config SERIAL_UARTLITE
           Say Y here if you want to use the Xilinx uartlite serial controller.
 
           To compile this driver as a module, choose M here: the
-          module will be called uartlite.ko.
+          module will be called uartlite.
 
 config SERIAL_UARTLITE_CONSOLE
         bool "Support for console on Xilinx uartlite serial port"
diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/go7007/go7007.txt
index 9f6772bc68c2..1c2907c1dc81 100644
--- a/drivers/staging/go7007/go7007.txt
+++ b/drivers/staging/go7007/go7007.txt
@@ -2,7 +2,7 @@ This is a driver for the WIS GO7007SB multi-format video encoder.
 
 Pete Eberlein <pete@sensoray.com>
 
-The driver was orignally released under the GPL and is currently hosted at:
+The driver was originally released under the GPL and is currently hosted at:
 http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver
 The go7007 firmware can be acquired from the package on the site above.
 
@@ -24,7 +24,7 @@ These should be used instead of the non-standard GO7007 ioctls described
 below.
 
 
-The README files from the orignal package appear below:
+The README files from the original package appears below:
 
 ---------------------------------------------------------------------------
                      WIS GO7007SB Public Linux Driver
diff --git a/drivers/staging/panel/lcd-panel-cgram.txt b/drivers/staging/panel/lcd-panel-cgram.txt
index f9ceef4322a3..7f82c905763d 100644
--- a/drivers/staging/panel/lcd-panel-cgram.txt
+++ b/drivers/staging/panel/lcd-panel-cgram.txt
@@ -3,7 +3,7 @@ characters 0 to 7. The escape code to define a new character is
 '\e[LG' followed by one digit from 0 to 7, representing the character
 number, and up to 8 couples of hex digits terminated by a semi-colon
 (';'). Each couple of digits represents a line, with 1-bits for each
-illuminated pixel with LSB on the right. Lines are numberred from the
+illuminated pixel with LSB on the right. Lines are numbered from the
 top of the character to the bottom. On a 5x7 matrix, only the 5 lower
 bits of the 7 first bytes are used for each character. If the string
 is incomplete, only complete lines will be redefined. Here are some
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index c00f9ab9c46c..2edf2999f5c8 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -5664,7 +5664,7 @@ VOID 	AsicUpdateProtect(
 #if 0
         MacReg |= (pAd->CommonCfg.RtsThreshold << 8);
 #else
-        // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
+        // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
         if ((
 #ifdef DOT11_N_SUPPORT
                         (pAd->CommonCfg.BACapability.field.AmsduEnable) ||
diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c
index 8a82cee8bf26..a26bc033337d 100644
--- a/drivers/staging/rt2870/common/mlme.c
+++ b/drivers/staging/rt2870/common/mlme.c
@@ -5561,7 +5561,7 @@ VOID 	AsicUpdateProtect(
 #if 0
         MacReg |= (pAd->CommonCfg.RtsThreshold << 8);
 #else
-        // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
+        // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
         if ((
 #ifdef DOT11_N_SUPPORT
                         (pAd->CommonCfg.BACapability.field.AmsduEnable) ||
diff --git a/drivers/staging/rt3070/common/mlme.c b/drivers/staging/rt3070/common/mlme.c
index 0ffbfa36699e..0189bab013cf 100644
--- a/drivers/staging/rt3070/common/mlme.c
+++ b/drivers/staging/rt3070/common/mlme.c
@@ -5575,7 +5575,7 @@ VOID 	AsicUpdateProtect(
         RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg);
         MacReg &= 0xFF0000FF;
 
-        // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
+        // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
     if ((
 #ifdef DOT11_N_SUPPORT
                 (pAd->CommonCfg.BACapability.field.AmsduEnable) ||
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 888198c9a106..824e65bdc433 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -2424,7 +2424,7 @@ int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len)
 *       0               success
 *       >0              f/w reported error - f/w status code
 *       <0              driver reported error
-*       -ETIMEOUT       timout waiting for the cmd regs to become
+*       -ETIMEDOUT      timout waiting for the cmd regs to become
 *                       available, or waiting for the control reg
 *                       to indicate the Aux port is enabled.
 *       -ENODATA        the buffer does NOT contain a valid PDA.
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index eabf20eeb370..db964db42d3c 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -102,7 +102,7 @@ struct edgeport_port {
         __u8 shadow_mcr;
         __u8 shadow_lsr;
         __u8 lsr_mask;
-        __u32 ump_read_timeout;         /* Number of miliseconds the UMP will
+        __u32 ump_read_timeout;         /* Number of milliseconds the UMP will
                                            wait without data before completing
                                            a read short */
         int baud_rate;
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 9adbb4f90479..fd2c7bd9dfbe 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -8,7 +8,7 @@ menuconfig W1
           If you want W1 support, you should say Y here.
 
           This W1 support can also be built as a module.  If so, the module
-          will be called wire.ko.
+          will be called wire.
 
 if W1
 
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 96d2f8e4c275..3195fb8b7d9a 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -12,7 +12,7 @@ config W1_MASTER_MATROX
           using Matrox's G400 GPIO pins.
 
           This support is also available as a module.  If so, the module
-          will be called matrox_w1.ko.
+          will be called matrox_w1.
 
 config W1_MASTER_DS2490
         tristate "DS2490 USB <-> W1 transport layer for 1-wire"
@@ -22,7 +22,7 @@ config W1_MASTER_DS2490
           for example DS9490*.
 
           This support is also available as a module.  If so, the module
-          will be called ds2490.ko.
+          will be called ds2490.
 
 config W1_MASTER_DS2482
         tristate "Maxim DS2482 I2C to 1-Wire bridge"
@@ -56,7 +56,7 @@ config W1_MASTER_GPIO
           GPIO pins. This driver uses the GPIO API to control the wire.
 
           This support is also available as a module.  If so, the module
-          will be called w1-gpio.ko.
+          will be called w1-gpio.
 
 config HDQ_MASTER_OMAP
         tristate "OMAP HDQ driver"
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5744cac4864b..b166f2852a64 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -531,7 +531,7 @@ config SBC8360_WDT
           Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
 
           To compile this driver as a module, choose M here: the
-          module will be called sbc8360.ko.
+          module will be called sbc8360.
 
           Most people will say N.
 
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index 96eb2cbe5874..0c9059676690 100644
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -192,7 +192,7 @@ static int iop_wdt_release(struct inode *inode, struct file *file)
                 if (test_bit(WDT_ENABLED, &wdt_status))
                         state = wdt_disable();
 
-        /* if the timer is not disbaled reload and notify that we are still
+        /* if the timer is not disabled reload and notify that we are still
          * going down
          */
         if (state != 0) {