Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c

70 files changed, 190 insertions, 199 deletions

diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index 3dd6b7bb5d35..1bace29f4b6a 100644
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/drivers/block/mfmhd.c
+ * linux/drivers/acorn/block/mfmhd.c
  *
  * Copyright (C) 1995, 1996 Russell King, Dave Alan Gilbert (gilbertd@cs.man.ac.uk)
  *
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 56c5ba874623..0f9d4be7ed75 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -253,7 +253,7 @@ config ACPI_CUSTOM_DSDT
         depends on !STANDALONE
         default n 
         help
-          Thist option is to load a custom ACPI DSDT
+          This option is to load a custom ACPI DSDT
           If you don't know what that is, say N.
 
 config ACPI_CUSTOM_DSDT_FILE
@@ -310,7 +310,7 @@ config X86_PM_TIMER
           The Power Management Timer is available on all ACPI-capable,
           in most cases even if ACPI is unusable or blacklisted.
 
-          This timing source is not affected by powermanagement features
+          This timing source is not affected by power management features
           like aggressive processor idling, throttling, frequency and/or
           voltage scaling, unlike the commonly used Time Stamp Counter
           (TSC) timing source.
@@ -345,7 +345,7 @@ config ACPI_HOTPLUG_MEMORY
           Enabling this driver assumes that your platform hardware
           and firmware have support for hot-plugging physical memory. If
           your system does not support physically adding or ripping out 
-          memory DIMMs at some platfrom defined granularity (individually 
+          memory DIMMs at some platform defined granularity (individually 
           or as a bank) at runtime, then you need not enable this driver.
 
           If one selects "m," this driver can be loaded using the following
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 422e31d5f8e5..17dc22282e14 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -207,8 +207,7 @@ config BLK_DEV_UMEM
           module will be called umem.
 
           The umem driver has not yet been allocated a MAJOR number, so
-          one is chosen dynamically.  Use "devfs" or look in /proc/devices
-          for the device number
+          one is chosen dynamically.
 
 config BLK_DEV_UBD
         bool "Virtual block device"
@@ -407,7 +406,7 @@ config BLK_DEV_RAM_BLOCKSIZE
         depends on BLK_DEV_RAM
         default "1024"
         help
-          The default value is 1024 kilobytes.  PAGE_SIZE is a much more
+          The default value is 1024 bytes.  PAGE_SIZE is a much more
           efficient choice however.  The default is kept to ensure initrd
           setups function - apparently needed by the rd_load_image routine
           that supposes the filesystem in the image uses a 1024 blocksize.
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b38c84a7a8e3..2a0c50d84fc5 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1,4 +1,4 @@
-/* linux/drivers/cdrom/cdrom.c. 
+/* linux/drivers/cdrom/cdrom.c
    Copyright (c) 1996, 1997 David A. van Leeuwen.
    Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org>
    Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk>
diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c
index ef71022423c9..3cf4d641a51c 100644
--- a/drivers/char/hw_random/ixp4xx-rng.c
+++ b/drivers/char/hw_random/ixp4xx-rng.c
@@ -1,5 +1,5 @@
 /*
- * drivers/char/rng/ixp4xx-rng.c
+ * drivers/char/hw_random/ixp4xx-rng.c
  *
  * RNG driver for Intel IXP4xx family of NPUs
  *
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index a01d796d1eeb..e13dd1892bfd 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -1,5 +1,5 @@
 /*
- * driver/char/hw_random/omap-rng.c
+ * drivers/char/hw_random/omap-rng.c
  *
  * RNG driver for TI OMAP CPU family
  *
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README
index 70f8d19fb79f..480251fc78e2 100644
--- a/drivers/char/mwave/README
+++ b/drivers/char/mwave/README
@@ -41,10 +41,7 @@ Example to enable the 3780i DSP using ttyS1 resources:
 Accessing the driver
 --------------------
 
-You must also create a node for the driver.  Without devfs:
+You must also create a node for the driver:
   mkdir -p /dev/modems
   mknod --mode=660 /dev/modems/mwave c 10 219
-With devfs:
-  mkdir -p /dev/modems
-  ln -s ../misc/mwave /dev/modems/mwave
 
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index c91d9a660ec0..fd955dbd588c 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -1,5 +1,5 @@
 /*
- * drivers/watchdog/ixp2000_wdt.c
+ * drivers/char/watchdog/ixp2000_wdt.c
  *
  * Watchdog driver for Intel IXP2000 network processors
  *
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index db477f712388..5864bb865cfe 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -1,5 +1,5 @@
 /*
- * drivers/watchdog/ixp4xx_wdt.c
+ * drivers/char/watchdog/ixp4xx_wdt.c
  *
  * Watchdog driver for Intel IXP4xx network processors
  *
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 731c3d5da0dc..88f462122a30 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -64,7 +64,7 @@ config DELL_RBU
         help
          Say m if you want to have the option of updating the BIOS for your
          DELL system. Note you need a Dell OpenManage or Dell Update package (DUP)
-         supporting application to comunicate with the BIOS regarding the new
+         supporting application to communicate with the BIOS regarding the new
          image for the image update to take effect.
          See <file:Documentation/dell_rbu.txt> for more details on the driver.
 
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index b4502ed65793..5c261e1f92b2 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/i386/kernel/edd.c
+ * linux/drivers/firmware/edd.c
  *  Copyright (C) 2002, 2003, 2004 Dell Inc.
  *  by Matt Domsch <Matt_Domsch@dell.com>
  *  disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 0d9667921f61..510816c16da3 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -333,10 +333,10 @@ config I2C_PARPORT_LIGHT
 
           This driver is a light version of i2c-parport.  It doesn't depend
           on the parport driver, and uses direct I/O access instead.  This
-          might be prefered on embedded systems where wasting memory for
+          might be preferred on embedded systems where wasting memory for
           the clean but heavy parport handling is not an option.  The
           drawback is a reduced portability and the impossibility to
-          dasiy-chain other parallel port devices.
+          daisy-chain other parallel port devices.
           
           Don't say Y here if you said Y or M to i2c-parport.  Saying M to
           both is possible but both modules should not be loaded at the same
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 5bccb5d68318..80d4ba1bdfec 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -1,5 +1,5 @@
 /*
- * drivers/i2c/i2c-ibm_iic.c
+ * drivers/i2c/busses/i2c-ibm_iic.c
  *
  * Support for the IIC peripheral on IBM PPC 4xx
  *
diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h
index 2b3219d00e92..59d7b437f7ff 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -1,5 +1,5 @@
 /*
- * drivers/i2c/i2c-ibm_iic.h
+ * drivers/i2c/busses/i2c-ibm_iic.h
  *
  * Support for the IIC peripheral on IBM PPC 4xx
  * 
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index ab573254a8aa..1ce01fb0ac09 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -1,5 +1,5 @@
 /*
- * drivers/i2c/i2c-adap-ixp4xx.c
+ * drivers/i2c/busses/i2c-ixp4xx.c
  *
  * Intel's IXP4xx XScale NPU chipsets (IXP420, 421, 422, 425) do not have
  * an on board I2C controller but provide 16 GPIO pins that are often
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index 8b65a5cf8251..8ddbae4fafe6 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -1,4 +1,4 @@
-/* linux/drivers/i2c/scx200_i2c.c 
+/* linux/drivers/i2c/busses/scx200_i2c.c
 
    Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
 
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 15955996a1f3..608ca871744b 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -1,5 +1,5 @@
 /*
- * drivers/ide/ide-h8300.c
+ * drivers/ide/h8300/ide-h8300.c
  * H8/300 generic IDE interface
  */
 
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 31ad79f52df7..91c5344a945d 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/ide-pmac.c
+ * linux/drivers/ide/ppc/pmac.c
  *
  * Support for IDE interfaces on PowerMacs.
  * These IDE interfaces are memory-mapped and have a DBDMA channel
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 2769e505f051..672b92ef9f21 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -140,7 +140,7 @@ config IEEE1394_SBP2_PHYS_DMA
         help
           This builds sbp2 for use with non-OHCI host adapters which do not
           support physical DMA or for when ohci1394 is run with phys_dma=0.
-          Physical DMA is data movement without assistence of the drivers'
+          Physical DMA is data movement without assistance of the drivers'
           interrupt handlers.  This option includes the interrupt handlers
           that are required in absence of this hardware feature.
 
diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index d74653d7de1c..c75322d820d4 100644
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -26,7 +26,7 @@ config INFINIBAND_IPOIB_DEBUG_DATA
         bool "IP-over-InfiniBand data path debugging"
         depends on INFINIBAND_IPOIB_DEBUG
         ---help---
-          This option compiles debugging code into the the data path
+          This option compiles debugging code into the data path
           of the IPoIB driver.  The output can be turned on via the
           data_debug_level module parameter; however, even with output
           turned off, this debugging code will have some performance
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 67519ef0ef95..271263443c37 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -32,7 +32,7 @@ config JOYSTICK_ANALOG
           module will be called analog.
 
 config JOYSTICK_A3D
-        tristate "Assasin 3D and MadCatz Panther devices"
+        tristate "Assassin 3D and MadCatz Panther devices"
         select GAMEPORT
         help
           Say Y here if you have an FPGaming or MadCatz controller using the
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c79dec..679bde34d247 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD
           However, it has been thoroughly tested and is stable.
 
           If you want full HIL support including support for multiple
-          keyboards, mices and tablets, you have to enable the
+          keyboards, mice, and tablets, you have to enable the
           "HP System Device Controller i8042 Support" in the input/serio
           submenu.
 
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252c..8cdbfeca5903 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -115,9 +115,9 @@ config HP_SDC
         depends on GSC && SERIO
         default y
         ---help---
-          This option enables supports for the the "System Device
+          This option enables support for the "System Device
           Controller", an i8042 carrying microcode to manage a
-          few miscellanous devices on some Hewlett Packard systems.
+          few miscellaneous devices on some Hewlett Packard systems.
           The SDC itself contains a 10ms resolution timer/clock capable
           of delivering interrupts on a periodic and one-shot basis.
           The SDC may also be connected to a battery-backed real-time
diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig
index 51e66bc64208..01d4afd9d843 100644
--- a/drivers/isdn/hardware/eicon/Kconfig
+++ b/drivers/isdn/hardware/eicon/Kconfig
@@ -47,7 +47,7 @@ config ISDN_DIVAS_MAINT
         tristate "DIVA Maint driver support"
         depends on ISDN_DIVAS && m
         help
-          Enable Divas Maintainance driver.
+          Enable Divas Maintenance driver.
 
 endmenu
 
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 6dfc94122dd9..eb57a988e048 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -321,7 +321,7 @@ config HISAX_HFC_PCI
         help
           This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
 
-          For more informations see under
+          For more information see under
           <file:Documentation/isdn/README.hfc-pci>.
 
 config HISAX_W6692
diff --git a/drivers/isdn/hisax/amd7930_fn.h b/drivers/isdn/hisax/amd7930_fn.h
index e039c3a0f2a2..1f4d80c5e5a6 100644
--- a/drivers/isdn/hisax/amd7930_fn.h
+++ b/drivers/isdn/hisax/amd7930_fn.h
@@ -1,4 +1,4 @@
-/* 2001/10/02
+/* drivers/isdn/hisax/amd7930_fn.h
  *
  * gerdes_amd7930.h     Header-file included by
  *                      gerdes_amd7930.c
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index d424b4452028..aecbbe2e89a9 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -125,7 +125,7 @@ EXPORT_SYMBOL_GPL(led_classdev_register);
 
 /**
  * led_classdev_unregister - unregisters a object of led_properties class.
- * @led_cdev: the led device to unreigister
+ * @led_cdev: the led device to unregister
  *
  * Unregisters a previously registered via led_classdev_register object.
  */
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c
index 3b87951aa555..6f2d449ba983 100644
--- a/drivers/leds/leds-locomo.c
+++ b/drivers/leds/leds-locomo.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/leds/locomo.c
+ * linux/drivers/leds/leds-locomo.c
  *
  * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu>
  *
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index d5d649f5ccdb..7f8477d3a661 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -186,7 +186,7 @@ config THERM_ADT746X
         depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
         help
           This driver provides some thermostat and fan control for the
-          iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty
+          iBook G4, and the ATI based aluminium PowerBooks, allowing slightly
           better fan behaviour by default, and some manual control.
 
 config THERM_PM72
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index efd51e01c06e..b7fb367808d8 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -1,5 +1,5 @@
 /*
- * drivers/input/adbhid.c
+ * drivers/macintosh/adbhid.c
  *
  * ADB HID driver for Power Macintosh computers.
  *
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 38a0a5741d52..cb8281605be8 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4438,8 +4438,7 @@ static int md_release(struct inode *inode, struct file * file)
 {
         mddev_t *mddev = inode->i_bdev->bd_disk->private_data;
 
-        if (!mddev)
-                BUG();
+        BUG_ON(!mddev);
         mddev_put(mddev);
 
         return 0;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 37e4ff661b6c..e14f45780720 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1105,7 +1105,7 @@ static void compute_parity6(struct stripe_head *sh, int method)
                                 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
                                         wake_up(&conf->wait_for_overlap);
 
-                                if (sh->dev[i].written) BUG();
+                                BUG_ON(sh->dev[i].written);
                                 sh->dev[i].written = chosen;
                         }
                 break;
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index b5cdd57ec6f5..3d778c5aba68 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
           measurements.
 
           Please keep in mind that these updates cause traffic on the tuner
-          control bus and thus may or may not affect receiption sensitivity.
+          control bus and thus may or may not affect reception sensitivity.
 
           The default value should be a safe choice for common applications.
 
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 7015517e2c1b..6d96b17a7f81 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS
         ---help---
           Choose Y here if you want to see RDS/RBDS information like
           RadioText, Programme Service name, Clock Time and date, Programme
-          TYpe and Traffic Announcement/Programme identification.  You also
-          need to say Y to "miroSOUND PCM20 radio" and devfs!
+          Type and Traffic Announcement/Programme identification.
 
           It's not possible to read the raw RDS packets from the device, so
           the driver cant provide an V4L interface for this.  But the
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5c53fe62d38b..afb734df6e05 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -353,7 +353,7 @@ config VIDEO_SAA6588
         help
           Support for  Radio Data System (RDS) decoder. This allows seeing
           radio station identification transmitted using this standard.
-          Currentlly, it works only with bt8x8 chips.
+          Currently, it works only with bt8x8 chips.
 
           To compile this driver as a module, choose M here: the
           module will be called saa6588.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 51d68f32aa06..0f9d96963618 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054
         depends on VIDEO_CX88_DVB && DVB_MT352
         ---help---
           This adds DVB-T support for cards based on the
-          Connexant 2388x chip and the MT352 demodulator,
+          Conexant 2388x chip and the MT352 demodulator,
           which also require support for the VP-3054
           Secondary I2C bus, such at DNTV Live! DVB-T Pro.
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index 11f751a6bda5..f5e848410311 100644
--- a/drivers/media/video/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -175,8 +175,8 @@ dev_hint
    - If a device node is already occupied, registration will fail and
      the webcam is not available.
    - You can have up to 64 video devices; be sure to make enough device
-     nodes in /dev if you want to spread the numbers (this does not apply
-     to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA).
+     nodes in /dev if you want to spread the numbers.
+     After /dev/video9 comes /dev/video10 (not /dev/videoA).
    - If a camera does not match any dev_hint, it will simply get assigned
      the first available device node, just as it used to be.
 
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 6d8f30deb868..72e6d73beb40 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -270,7 +270,7 @@ config MTD_JEDEC
         tristate "JEDEC device support"
         depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
         help
-          Enable older older JEDEC flash interface devices for self
+          Enable older JEDEC flash interface devices for self
           programming flash.  It is commonly used in older AMD chips.  It is
           only called JEDEC because the JEDEC association
           <http://www.jedec.org/> distributes the identification codes for the
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index 51f962dd7e31..e074bb6787d2 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -1,4 +1,4 @@
-/* linux/drivers/mtd/maps/bast_flash.c
+/* linux/drivers/mtd/maps/bast-flash.c
  *
  * Copyright (c) 2004-2005 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
index a43c49905cac..e0558b0b2fe6 100644
--- a/drivers/mtd/maps/dmv182.c
+++ b/drivers/mtd/maps/dmv182.c
@@ -1,6 +1,6 @@
 
 /*
- * drivers/mtd/maps/svme182.c
+ * drivers/mtd/maps/dmv182.c
  *
  * Flash map driver for the Dy4 SVME182 board
  *
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index c99302ed3823..1831340e5f51 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -21,7 +21,7 @@ config MTD_NAND_VERIFY_WRITE
           NAND flash device internally checks only bits transitioning
           from 1 to 0. There is a rare possibility that even though the
           device thinks the write was successful, a bit could have been
-          flipped accidentaly due to device wear or something else.
+          flipped accidentally due to device wear or something else.
 
 config MTD_NAND_ECC_SMC
         bool "NAND ECC Smart Media byte order"
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index 465961b8bcd1..373bddce8f1c 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -21,7 +21,7 @@ config MTD_ONENAND_VERIFY_WRITE
           OneNAND flash device internally checks only bits transitioning
           from 1 to 0. There is a rare possibility that even though the
           device thinks the write was successful, a bit could have been
-          flipped accidentaly due to device wear or something else.
+          flipped accidentally due to device wear or something else.
 
 config MTD_ONENAND_GENERIC
         tristate "OneNAND Flash device via platform device driver"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ff8a8c0a26d5..ab92cc794c64 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2115,7 +2115,7 @@ config SKY2
         depends on PCI && EXPERIMENTAL
         select CRC32
         ---help---
-          This driver supports Gigabit Ethernet adapters based on the the
+          This driver supports Gigabit Ethernet adapters based on the
           Marvell Yukon 2 chipset:
           Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
           88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/arm/am79c961a.h
index 6a49ac7f6d46..483009fe6ec2 100644
--- a/drivers/net/arm/am79c961a.h
+++ b/drivers/net/arm/am79c961a.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/net/am79c961.h
+ * linux/drivers/net/arm/am79c961a.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.h b/drivers/net/ibm_emac/ibm_emac_debug.h
index 5761389495d0..6c7dccc84bf5 100644
--- a/drivers/net/ibm_emac/ibm_emac_debug.h
+++ b/drivers/net/ibm_emac/ibm_emac_debug.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_emac/ibm_ocp_debug.h
+ * drivers/net/ibm_emac/ibm_emac_debug.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index 94abde55e2e9..117ea486c2ca 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_emac/ibm_emac_rgmii.c
+ * drivers/net/ibm_emac/ibm_emac_rgmii.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 7d3e270c4f45..3b2f00b9b7bd 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -224,8 +224,7 @@ static void __devexit tms_pci_detach (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
-        if (!dev)
-                BUG();
+        BUG_ON(!dev);
         unregister_netdev(dev);
         release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
         free_irq(dev->irq, dev);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index bd4a68c85a47..ece3d9c2dc61 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -301,7 +301,7 @@ config HERMES
         tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
         depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA)
         ---help---
-          A driver for 802.11b wireless cards based based on the "Hermes" or
+          A driver for 802.11b wireless cards based on the "Hermes" or
           Intersil HFA384x (Prism 2) MAC controller.  This includes the vast
           majority of the PCMCIA 802.11b cards (which are nearly all rebadges)
           - except for the Cisco/Aironet cards.  Cards supported include the
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 4a9f025a6b58..2eb3577a88c5 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/parisc/kernel/power.c
+ * linux/drivers/parisc/power.c
  * HP PARISC soft power switch support driver
  *
  * Copyright (c) 2001-2005 Helge Deller <deller@gmx.de>
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index fd41e28101ea..83ee095ec6e2 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -30,7 +30,7 @@
 #undef DEBUG
 
 #ifdef DEBUG
-#define DPRINTK(stuff...) printk (stuff)
+#define DPRINTK(stuff...) printk(stuff)
 #else
 #define DPRINTK(stuff...)
 #endif
@@ -46,16 +46,16 @@ static DEFINE_SPINLOCK(topology_lock);
 static int numdevs = 0;
 
 /* Forward-declaration of lower-level functions. */
-static int mux_present (struct parport *port);
-static int num_mux_ports (struct parport *port);
-static int select_port (struct parport *port);
-static int assign_addrs (struct parport *port);
+static int mux_present(struct parport *port);
+static int num_mux_ports(struct parport *port);
+static int select_port(struct parport *port);
+static int assign_addrs(struct parport *port);
 
 /* Add a device to the discovered topology. */
-static void add_dev (int devnum, struct parport *port, int daisy)
+static void add_dev(int devnum, struct parport *port, int daisy)
 {
         struct daisydev *newdev, **p;
-        newdev = kmalloc (sizeof (struct daisydev), GFP_KERNEL);
+        newdev = kmalloc(sizeof(struct daisydev), GFP_KERNEL);
         if (newdev) {
                 newdev->port = port;
                 newdev->daisy = daisy;
@@ -70,9 +70,9 @@ static void add_dev (int devnum, struct parport *port, int daisy)
 }
 
 /* Clone a parport (actually, make an alias). */
-static struct parport *clone_parport (struct parport *real, int muxport)
+static struct parport *clone_parport(struct parport *real, int muxport)
 {
-        struct parport *extra = parport_register_port (real->base,
+        struct parport *extra = parport_register_port(real->base,
                                                        real->irq,
                                                        real->dma,
                                                        real->ops);
@@ -88,7 +88,7 @@ static struct parport *clone_parport (struct parport *real, int muxport)
 
 /* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains.
  * Return value is number of devices actually detected. */
-int parport_daisy_init (struct parport *port)
+int parport_daisy_init(struct parport *port)
 {
         int detected = 0;
         char *deviceid;
@@ -103,26 +103,26 @@ again:
 
         /* If mux present on normal port, need to create new
          * parports for each extra port. */
-        if (port->muxport < 0 && mux_present (port) &&
+        if (port->muxport < 0 && mux_present(port) &&
             /* don't be fooled: a mux must have 2 or 4 ports. */
-            ((num_ports = num_mux_ports (port)) == 2 || num_ports == 4)) {
+            ((num_ports = num_mux_ports(port)) == 2 || num_ports == 4)) {
                 /* Leave original as port zero. */
                 port->muxport = 0;
-                printk (KERN_INFO
+                printk(KERN_INFO
                         "%s: 1st (default) port of %d-way multiplexor\n",
                         port->name, num_ports);
                 for (i = 1; i < num_ports; i++) {
                         /* Clone the port. */
-                        struct parport *extra = clone_parport (port, i);
+                        struct parport *extra = clone_parport(port, i);
                         if (!extra) {
-                                if (signal_pending (current))
+                                if (signal_pending(current))
                                         break;
 
-                                schedule ();
+                                schedule();
                                 continue;
                         }
 
-                        printk (KERN_INFO
+                        printk(KERN_INFO
                                 "%s: %d%s port of %d-way multiplexor on %s\n",
                                 extra->name, i + 1, th[i + 1], num_ports,
                                 port->name);
@@ -135,34 +135,34 @@ again:
         }
 
         if (port->muxport >= 0)
-                select_port (port);
+                select_port(port);
 
-        parport_daisy_deselect_all (port);
-        detected += assign_addrs (port);
+        parport_daisy_deselect_all(port);
+        detected += assign_addrs(port);
 
         /* Count the potential legacy device at the end. */
-        add_dev (numdevs++, port, -1);
+        add_dev(numdevs++, port, -1);
 
         /* Find out the legacy device's IEEE 1284 device ID. */
-        deviceid = kmalloc (1024, GFP_KERNEL);
+        deviceid = kmalloc(1024, GFP_KERNEL);
         if (deviceid) {
-                if (parport_device_id (numdevs - 1, deviceid, 1024) > 2)
+                if (parport_device_id(numdevs - 1, deviceid, 1024) > 2)
                         detected++;
 
-                kfree (deviceid);
+                kfree(deviceid);
         }
 
         if (!detected && !last_try) {
                 /* No devices were detected.  Perhaps they are in some
                    funny state; let's try to reset them and see if
                    they wake up. */
-                parport_daisy_fini (port);
-                parport_write_control (port, PARPORT_CONTROL_SELECT);
-                udelay (50);
-                parport_write_control (port,
+                parport_daisy_fini(port);
+                parport_write_control(port, PARPORT_CONTROL_SELECT);
+                udelay(50);
+                parport_write_control(port,
                                        PARPORT_CONTROL_SELECT |
                                        PARPORT_CONTROL_INIT);
-                udelay (50);
+                udelay(50);
                 last_try = 1;
                 goto again;
         }
@@ -171,7 +171,7 @@ again:
 }
 
 /* Forget about devices on a physical port. */
-void parport_daisy_fini (struct parport *port)
+void parport_daisy_fini(struct parport *port)
 {
         struct daisydev **p;
 
@@ -214,7 +214,7 @@ void parport_daisy_fini (struct parport *port)
  *      for parport_register_device().
  **/
 
-struct pardevice *parport_open (int devnum, const char *name,
+struct pardevice *parport_open(int devnum, const char *name,
                                 int (*pf) (void *), void (*kf) (void *),
                                 void (*irqf) (int, void *, struct pt_regs *),
                                 int flags, void *handle)
@@ -237,7 +237,7 @@ struct pardevice *parport_open (int devnum, const char *name,
         port = parport_get_port(p->port);
         spin_unlock(&topology_lock);
 
-        dev = parport_register_device (port, name, pf, kf,
+        dev = parport_register_device(port, name, pf, kf,
                                        irqf, flags, handle);
         parport_put_port(port);
         if (!dev)
@@ -248,13 +248,13 @@ struct pardevice *parport_open (int devnum, const char *name,
         /* Check that there really is a device to select. */
         if (daisy >= 0) {
                 int selected;
-                parport_claim_or_block (dev);
+                parport_claim_or_block(dev);
                 selected = port->daisy;
-                parport_release (dev);
+                parport_release(dev);
 
                 if (selected != daisy) {
                         /* No corresponding device. */
-                        parport_unregister_device (dev);
+                        parport_unregister_device(dev);
                         return NULL;
                 }
         }
@@ -270,9 +270,9 @@ struct pardevice *parport_open (int devnum, const char *name,
  *      parport_register_device().
  **/
 
-void parport_close (struct pardevice *dev)
+void parport_close(struct pardevice *dev)
 {
-        parport_unregister_device (dev);
+        parport_unregister_device(dev);
 }
 
 /**
@@ -287,7 +287,7 @@ void parport_close (struct pardevice *dev)
  *      exists.
  **/
 
-int parport_device_num (int parport, int mux, int daisy)
+int parport_device_num(int parport, int mux, int daisy)
 {
         int res = -ENXIO;
         struct daisydev *dev;
@@ -305,16 +305,16 @@ int parport_device_num (int parport, int mux, int daisy)
 }
 
 /* Send a daisy-chain-style CPP command packet. */
-static int cpp_daisy (struct parport *port, int cmd)
+static int cpp_daisy(struct parport *port, int cmd)
 {
         unsigned char s;
 
-        parport_data_forward (port);
-        parport_write_data (port, 0xaa); udelay (2);
-        parport_write_data (port, 0x55); udelay (2);
-        parport_write_data (port, 0x00); udelay (2);
-        parport_write_data (port, 0xff); udelay (2);
-        s = parport_read_status (port) & (PARPORT_STATUS_BUSY
+        parport_data_forward(port);
+        parport_write_data(port, 0xaa); udelay(2);
+        parport_write_data(port, 0x55); udelay(2);
+        parport_write_data(port, 0x00); udelay(2);
+        parport_write_data(port, 0xff); udelay(2);
+        s = parport_read_status(port) & (PARPORT_STATUS_BUSY
                                           | PARPORT_STATUS_PAPEROUT
                                           | PARPORT_STATUS_SELECT
                                           | PARPORT_STATUS_ERROR);
@@ -322,54 +322,54 @@ static int cpp_daisy (struct parport *port, int cmd)
                   | PARPORT_STATUS_PAPEROUT
                   | PARPORT_STATUS_SELECT
                   | PARPORT_STATUS_ERROR)) {
-                DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n",
+                DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n",
                          port->name, s);
                 return -ENXIO;
         }
 
-        parport_write_data (port, 0x87); udelay (2);
-        s = parport_read_status (port) & (PARPORT_STATUS_BUSY
+        parport_write_data(port, 0x87); udelay(2);
+        s = parport_read_status(port) & (PARPORT_STATUS_BUSY
                                           | PARPORT_STATUS_PAPEROUT
                                           | PARPORT_STATUS_SELECT
                                           | PARPORT_STATUS_ERROR);
         if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
-                DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n",
+                DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n",
                          port->name, s);
                 return -ENXIO;
         }
 
-        parport_write_data (port, 0x78); udelay (2);
-        parport_write_data (port, cmd); udelay (2);
-        parport_frob_control (port,
+        parport_write_data(port, 0x78); udelay(2);
+        parport_write_data(port, cmd); udelay(2);
+        parport_frob_control(port,
                               PARPORT_CONTROL_STROBE,
                               PARPORT_CONTROL_STROBE);
-        udelay (1);
-        s = parport_read_status (port);
-        parport_frob_control (port, PARPORT_CONTROL_STROBE, 0);
-        udelay (1);
-        parport_write_data (port, 0xff); udelay (2);
+        udelay(1);
+        s = parport_read_status(port);
+        parport_frob_control(port, PARPORT_CONTROL_STROBE, 0);
+        udelay(1);
+        parport_write_data(port, 0xff); udelay(2);
 
         return s;
 }
 
 /* Send a mux-style CPP command packet. */
-static int cpp_mux (struct parport *port, int cmd)
+static int cpp_mux(struct parport *port, int cmd)
 {
         unsigned char s;
         int rc;
 
-        parport_data_forward (port);
-        parport_write_data (port, 0xaa); udelay (2);
-        parport_write_data (port, 0x55); udelay (2);
-        parport_write_data (port, 0xf0); udelay (2);
-        parport_write_data (port, 0x0f); udelay (2);
-        parport_write_data (port, 0x52); udelay (2);
-        parport_write_data (port, 0xad); udelay (2);
-        parport_write_data (port, cmd); udelay (2);
+        parport_data_forward(port);
+        parport_write_data(port, 0xaa); udelay(2);
+        parport_write_data(port, 0x55); udelay(2);
+        parport_write_data(port, 0xf0); udelay(2);
+        parport_write_data(port, 0x0f); udelay(2);
+        parport_write_data(port, 0x52); udelay(2);
+        parport_write_data(port, 0xad); udelay(2);
+        parport_write_data(port, cmd); udelay(2);
 
-        s = parport_read_status (port);
+        s = parport_read_status(port);
         if (!(s & PARPORT_STATUS_ACK)) {
-                DPRINTK (KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
+                DPRINTK(KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
                          port->name, cmd, s);
                 return -EIO;
         }
@@ -382,12 +382,12 @@ static int cpp_mux (struct parport *port, int cmd)
         return rc;
 }
 
-void parport_daisy_deselect_all (struct parport *port)
+void parport_daisy_deselect_all(struct parport *port)
 {
-        cpp_daisy (port, 0x30);
+        cpp_daisy(port, 0x30);
 }
 
-int parport_daisy_select (struct parport *port, int daisy, int mode)
+int parport_daisy_select(struct parport *port, int daisy, int mode)
 {
         switch (mode)
         {
@@ -395,14 +395,14 @@ int parport_daisy_select (struct parport *port, int daisy, int mode)
                 case IEEE1284_MODE_EPP:
                 case IEEE1284_MODE_EPPSL:
                 case IEEE1284_MODE_EPPSWE:
-                        return !(cpp_daisy (port, 0x20 + daisy) &
+                        return !(cpp_daisy(port, 0x20 + daisy) &
                                  PARPORT_STATUS_ERROR);
 
                 // For these modes we should switch to ECP mode:
                 case IEEE1284_MODE_ECP:
                 case IEEE1284_MODE_ECPRLE:
                 case IEEE1284_MODE_ECPSWE: 
-                        return !(cpp_daisy (port, 0xd0 + daisy) &
+                        return !(cpp_daisy(port, 0xd0 + daisy) &
                                  PARPORT_STATUS_ERROR);
 
                 // Nothing was told for BECP in Daisy chain specification.
@@ -413,28 +413,28 @@ int parport_daisy_select (struct parport *port, int daisy, int mode)
                 case IEEE1284_MODE_BYTE:
                 case IEEE1284_MODE_COMPAT:
                 default:
-                        return !(cpp_daisy (port, 0xe0 + daisy) &
+                        return !(cpp_daisy(port, 0xe0 + daisy) &
                                  PARPORT_STATUS_ERROR);
         }
 }
 
-static int mux_present (struct parport *port)
+static int mux_present(struct parport *port)
 {
-        return cpp_mux (port, 0x51) == 3;
+        return cpp_mux(port, 0x51) == 3;
 }
 
-static int num_mux_ports (struct parport *port)
+static int num_mux_ports(struct parport *port)
 {
-        return cpp_mux (port, 0x58);
+        return cpp_mux(port, 0x58);
 }
 
-static int select_port (struct parport *port)
+static int select_port(struct parport *port)
 {
         int muxport = port->muxport;
-        return cpp_mux (port, 0x60 + muxport) == muxport;
+        return cpp_mux(port, 0x60 + muxport) == muxport;
 }
 
-static int assign_addrs (struct parport *port)
+static int assign_addrs(struct parport *port)
 {
         unsigned char s;
         unsigned char daisy;
@@ -442,12 +442,12 @@ static int assign_addrs (struct parport *port)
         int detected;
         char *deviceid;
 
-        parport_data_forward (port);
-        parport_write_data (port, 0xaa); udelay (2);
-        parport_write_data (port, 0x55); udelay (2);
-        parport_write_data (port, 0x00); udelay (2);
-        parport_write_data (port, 0xff); udelay (2);
-        s = parport_read_status (port) & (PARPORT_STATUS_BUSY
+        parport_data_forward(port);
+        parport_write_data(port, 0xaa); udelay(2);
+        parport_write_data(port, 0x55); udelay(2);
+        parport_write_data(port, 0x00); udelay(2);
+        parport_write_data(port, 0xff); udelay(2);
+        s = parport_read_status(port) & (PARPORT_STATUS_BUSY
                                           | PARPORT_STATUS_PAPEROUT
                                           | PARPORT_STATUS_SELECT
                                           | PARPORT_STATUS_ERROR);
@@ -455,40 +455,40 @@ static int assign_addrs (struct parport *port)
                   | PARPORT_STATUS_PAPEROUT
                   | PARPORT_STATUS_SELECT
                   | PARPORT_STATUS_ERROR)) {
-                DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n",
+                DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n",
                          port->name, s);
                 return 0;
         }
 
-        parport_write_data (port, 0x87); udelay (2);
-        s = parport_read_status (port) & (PARPORT_STATUS_BUSY
+        parport_write_data(port, 0x87); udelay(2);
+        s = parport_read_status(port) & (PARPORT_STATUS_BUSY
                                           | PARPORT_STATUS_PAPEROUT
                                           | PARPORT_STATUS_SELECT
                                           | PARPORT_STATUS_ERROR);
         if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
-                DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n",
+                DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n",
                          port->name, s);
                 return 0;
         }
 
-        parport_write_data (port, 0x78); udelay (2);
-        s = parport_read_status (port);
+        parport_write_data(port, 0x78); udelay(2);
+        s = parport_read_status(port);
 
         for (daisy = 0;
              (s & (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT))
                      == (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT)
                      && daisy < 4;
              ++daisy) {
-                parport_write_data (port, daisy);
-                udelay (2);
-                parport_frob_control (port,
+                parport_write_data(port, daisy);
+                udelay(2);
+                parport_frob_control(port,
                                       PARPORT_CONTROL_STROBE,
                                       PARPORT_CONTROL_STROBE);
-                udelay (1);
-                parport_frob_control (port, PARPORT_CONTROL_STROBE, 0);
-                udelay (1);
+                udelay(1);
+                parport_frob_control(port, PARPORT_CONTROL_STROBE, 0);
+                udelay(1);
 
-                add_dev (numdevs++, port, daisy);
+                add_dev(numdevs++, port, daisy);
 
                 /* See if this device thought it was the last in the
                  * chain. */
@@ -499,21 +499,21 @@ static int assign_addrs (struct parport *port)
                    last_dev from next device or if last_dev does not
                    work status lines from some non-daisy chain
                    device. */
-                s = parport_read_status (port);
+                s = parport_read_status(port);
         }
 
-        parport_write_data (port, 0xff); udelay (2);
+        parport_write_data(port, 0xff); udelay(2);
         detected = numdevs - thisdev;
-        DPRINTK (KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name,
+        DPRINTK(KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name,
                  detected);
 
         /* Ask the new devices to introduce themselves. */
-        deviceid = kmalloc (1024, GFP_KERNEL);
+        deviceid = kmalloc(1024, GFP_KERNEL);
         if (!deviceid) return 0;
 
         for (daisy = 0; thisdev < numdevs; thisdev++, daisy++)
-                parport_device_id (thisdev, deviceid, 1024);
+                parport_device_id(thisdev, deviceid, 1024);
 
-        kfree (deviceid);
+        kfree(deviceid);
         return detected;
 }
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 8a60f391ffcf..6e780db9454d 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -157,7 +157,7 @@ config HOTPLUG_PCI_RPA
         tristate "RPA PCI Hotplug driver"
         depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
         help
-          Say Y here if you have a a RPA system that supports PCI Hotplug.
+          Say Y here if you have a RPA system that supports PCI Hotplug.
 
           To compile this driver as a module, choose M here: the
           module will be called rpaphp.
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 0b2d2c3579a7..4142115d298e 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -15,4 +15,4 @@ config RAPIDIO_DISC_TIMEOUT
         default "30"
         ---help---
           Amount of time a discovery node waits for a host to complete
-          enumeration beforing giving up.
+          enumeration before giving up.
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 9eeef964663a..2f0b77724192 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -1,4 +1,4 @@
-/* drivers/char/max6902.c
+/* drivers/rtc/rtc-max6902.c
  *
  * Copyright (C) 2006 8D Technologies inc.
  * Copyright (C) 2004 Compulab Ltd.
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 836a58bb0305..40b6fc86f6a8 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -10,8 +10,6 @@
  *                      timer interrupts.  We use a timer to periodically 
  *                      reset 'stopped' watchdogs on affected platforms.
  *
- * TODO:        DevFS support (/dev/watchdogs/0 ... /dev/watchdogs/2)
- *
  * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
  */
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index dab082002e6f..c6dfb6fa13bf 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -40,10 +40,10 @@ config SCSI_PROC_FS
         default y
         ---help---
           This option enables support for the various files in
-          /proc/scsi.  In Linux 2.6 this has been superceeded by
+          /proc/scsi.  In Linux 2.6 this has been superseded by
           files in sysfs but many legacy applications rely on this.
 
-          If unusure say Y.
+          If unsure say Y.
 
 comment "SCSI support type (disk, tape, CD-ROM)"
         depends on SCSI
@@ -85,7 +85,7 @@ config CHR_DEV_OSST
         tristate "SCSI OnStream SC-x0 tape support"
         depends on SCSI
         ---help---
-          The OnStream SC-x0 SCSI tape drives can not be driven by the
+          The OnStream SC-x0 SCSI tape drives cannot be driven by the
           standard st driver, but instead need this special osst driver and
           use the  /dev/osstX char device nodes (major 206).  Via usb-storage
           and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 7955ebe8e1e8..911ea1756e55 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -22,12 +22,12 @@ config AIC79XX_CMDS_PER_DEVICE
         to be used for any device.  The aic7xxx driver will automatically
         vary this number based on device behavior.  For devices with a
         fixed maximum, the driver will eventually lock to this maximum
-        and display a console message inidicating this value.
+        and display a console message indicating this value.
 
         Due to resource allocation issues in the Linux SCSI mid-layer, using
         a high number of commands per device may result in memory allocation
         failures when many devices are attached to the system.  For this reason,
-        the default is set to 32.  Higher values may result in higer performance
+        the default is set to 32.  Higher values may result in higher performance
         on some devices.  The upper bound is 253.  0 disables tagged queueing.
 
         Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 5517da5855f0..cd93f9a8611f 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -27,12 +27,12 @@ config AIC7XXX_CMDS_PER_DEVICE
         to be used for any device.  The aic7xxx driver will automatically
         vary this number based on device behavior.  For devices with a
         fixed maximum, the driver will eventually lock to this maximum
-        and display a console message inidicating this value.
+        and display a console message indicating this value.
 
         Due to resource allocation issues in the Linux SCSI mid-layer, using
         a high number of commands per device may result in memory allocation
         failures when many devices are attached to the system.  For this reason,
-        the default is set to 32.  Higher values may result in higer performance
+        the default is set to 32.  Higher values may result in higher performance
         on some devices.  The upper bound is 253.  0 disables tagged queueing.
 
         Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index a28940156703..4385e9e3ded6 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/drivers/scsi/arxescsi.c
+ * linux/drivers/scsi/arm/arxescsi.c
  *
  * Copyright (C) 1997-2000 Russell King, Stefan Hanske
  *
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 57438326b07f..76d83ade9857 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/char/21285.c
+ * linux/drivers/serial/21285.c
  *
  * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
  *
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d926272a40db..653098bc2dd5 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -121,7 +121,7 @@ config SERIAL_8250_RUNTIME_UARTS
         default "4"
         help
           Set this to the maximum number of serial ports you want
-          the kernel to register at boot time.  This can be overriden
+          the kernel to register at boot time.  This can be overridden
           with the module parameter "nr_uarts", or boot-time parameter
           8250.nr_uarts
 
@@ -205,7 +205,7 @@ config SERIAL_8250_BOCA
         depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
         help
           Say Y here if you have a Boca serial board.  Please read the Boca
-          mini-HOWTO, avaialble from <http://www.tldp.org/docs.html#howto>
+          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
 
           To compile this driver as a module, choose M here: the module
           will be called 8250_boca.
@@ -667,7 +667,7 @@ config SERIAL_68328
         depends on M68328 || M68EZ328 || M68VZ328
         help
           This driver supports the built-in serial port of the Motorola 68328
-          (standard, EZ and VZ varities).
+          (standard, EZ and VZ varieties).
 
 config SERIAL_68328_RTS_CTS
         bool "Support RTS/CTS on 68328 serial port"
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 5d867ab581b7..5eb49ea63bfe 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/serial/cpm_uart_cpm1.h
+ * linux/drivers/serial/cpm_uart/cpm_uart_cpm1.h
  *
  * Driver for CPM (SCC/SMC) serial ports
  * 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index a663300d3476..4b779111eaf9 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/serial/cpm_uart_cpm2.h
+ * linux/drivers/serial/cpm_uart/cpm_uart_cpm2.h
  *
  * Driver for CPM (SCC/SMC) serial ports
  * 
diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
index 550ddfa71a43..b450cbaa3a0b 100644
--- a/drivers/usb/atm/Kconfig
+++ b/drivers/usb/atm/Kconfig
@@ -64,7 +64,7 @@ config USB_XUSBATM
           Say Y here if you have a DSL USB modem not explicitly supported by
           another USB DSL drivers.  In order to use your modem you will need to
           pass the vendor ID, product ID, and endpoint numbers for transmission
-          and reception as module parameters.  You may need to initialize the
+          and reception as module parameters.  You may need to initialize
           the modem using a user space utility (a firmware loader for example).
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index c376c655c5de..f794f07cfb33 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -1,5 +1,5 @@
 /*
- * drivers/usb/file.c
+ * drivers/usb/core/file.c
  *
  * (C) Copyright Linus Torvalds 1999
  * (C) Copyright Johannes Erdfelt 1999-2001
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e4df9edf1bc0..467cb02832f3 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1,5 +1,5 @@
 /*
- * drivers/usb/usb.c
+ * drivers/usb/core/usb.c
  *
  * (C) Copyright Linus Torvalds 1999
  * (C) Copyright Johannes Erdfelt 1999-2001
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8e5dd6f29d0b..bbbc82a8336a 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -7,7 +7,7 @@
 #
 #  - Host systems (like PCs) need CONFIG_USB (with "A" jacks).
 #  - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks).
-#  - Some systems have both kinds of of controller.
+#  - Some systems have both kinds of controllers.
 #
 # With help from a special transceiver and a "Mini-AB" jack, systems with
 # both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 422a4b288e34..fe2c4cd53f5a 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -119,7 +119,7 @@ config USB_STORAGE_ALAUDA
           Say Y here to include additional code to support the Olympus MAUSB-10
           and Fujifilm DPC-R1 USB Card reader/writer devices.
 
-          These devices are based on the Alauda chip and support support both
+          These devices are based on the Alauda chip and support both
           XD and SmartMedia cards.
 
 config USB_STORAGE_ONETOUCH
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a1c8923b0bf5..daaa486159cf 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -188,7 +188,7 @@ config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
         bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
         help
           This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
-          color QVGA, HRTFT panel.  The LogicPD device includes an
+          color QVGA, HRTFT panel.  The LogicPD device includes
           an integrated HRTFT controller IC.
           The native resolution is 240x320.
 
@@ -403,7 +403,7 @@ config FB_ARC
           is based on the KS-108 lcd controller and is typically a matrix
           of 2*n chips. This driver was tested with a 128x64 panel. This
           driver supports it for use with x86 SBCs through a 16 bit GPIO
-          interface (8 bit data, 8 bit control). If you anticpate using
+          interface (8 bit data, 8 bit control). If you anticipate using
           this driver, say Y or M; otherwise say N. You must specify the
           GPIO IO address to be used for setting control and data.
 
@@ -771,7 +771,7 @@ config FB_RIVA_DEBUG
         default n
         help
           Say Y here if you want the Riva driver to output all sorts
-          of debugging informations to provide to the maintainer when
+          of debugging information to provide to the maintainer when
           something goes wrong.
 
 config FB_RIVA_BACKLIGHT
@@ -865,7 +865,7 @@ config FB_INTEL_DEBUG
         depends on FB_INTEL
         ---help---
           Say Y here if you want the Intel driver to output all sorts
-          of debugging informations to provide to the maintainer when
+          of debugging information to provide to the maintainer when
           something goes wrong.
 
 config FB_INTEL_I2C
@@ -1062,7 +1062,7 @@ config FB_RADEON_DEBUG
         default n
         help
           Say Y here if you want the Radeon driver to output all sorts
-          of debugging informations to provide to the maintainer when
+          of debugging information to provide to the maintainer when
           something goes wrong.
 
 config FB_ATY128
diff --git a/drivers/video/s3c2410fb.h b/drivers/video/s3c2410fb.h
index be40968f899e..f3f8a8e15012 100644
--- a/drivers/video/s3c2410fb.h
+++ b/drivers/video/s3c2410fb.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/s3c2410fb.h
+ * linux/drivers/video/s3c2410fb.h
  * Copyright (c) Arnaud Patard
  *
  * This file is subject to the terms and conditions of the GNU General Public
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 8b3d0f0c7bd5..27c9d05d03ef 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -21,7 +21,7 @@ config W1_CON
           There are three types of messages between w1 core and userspace:
           1. Events. They are generated each time new master or slave device found
                 either due to automatic or requested search.
-          2. Userspace commands. Includes read/write and search/alarm search comamnds.
+          2. Userspace commands. Includes read/write and search/alarm search commands.
           3. Replies to userspace commands.
 
 source drivers/w1/masters/Kconfig