[PATCH] Change all <module>.o to .ko in Kconfig files

From:  GertJan Spoelman <kl@gjs.cc>

  OK, here is a new patch, I edited the old patch and took out the .ko's
  so now the extension is trimmed instead.

68 files changed, 615 insertions, 614 deletions

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 4ea5e959127d..a6ff17d08bb1 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -34,7 +34,7 @@ config ATM_ENI
 
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
-	  <file:Documentation/modules.txt>.  The module will be called eni.o.
+	  <file:Documentation/modules.txt>.  The module will be called eni.
 
 config ATM_ENI_DEBUG
 	bool "Enable extended debugging"
@@ -141,7 +141,7 @@ config ATM_FIRESTREAM
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  firestream.o.
+	  firestream.
 
 config ATM_ZATM
 	tristate "ZeitNet ZN1221/ZN1225"
@@ -152,7 +152,7 @@ config ATM_ZATM
 
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
-	  <file:Documentation/modules.txt>.  The module will be called zatm.o.
+	  <file:Documentation/modules.txt>.  The module will be called zatm.
 
 config ATM_ZATM_DEBUG
 	bool "Enable extended debugging"
@@ -191,7 +191,7 @@ config ATM_NICSTAR
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>. The module will be called
-	  nicstar.o.
+	  nicstar.
 
 config ATM_NICSTAR_USE_SUNI
 	bool "Use suni PHY driver (155Mbps)"
@@ -223,7 +223,7 @@ config ATM_IDT77252
 
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
-	  <file:Documentation/modules.txt>. The module will be called idt77252.o
+	  <file:Documentation/modules.txt>. The module will be called idt77252
 
 config ATM_IDT77252_DEBUG
 	bool "Enable debugging messages"
@@ -256,7 +256,7 @@ config ATM_AMBASSADOR
 	depends on PCI
 	help
 	  This is a driver for ATMizer based ATM card produced by Madge
-	  Networks Ltd. Say Y (or M to compile as a module named ambassador.o)
+	  Networks Ltd. Say Y (or M to compile as a module named ambassador)
 	  here if you have one of these cards.
 
 config ATM_AMBASSADOR_DEBUG
@@ -281,7 +281,7 @@ config ATM_HORIZON
 	help
 	  This is a driver for the Horizon chipset ATM adapter cards once
 	  produced by Madge Networks Ltd. Say Y (or M to compile as a module
-	  named horizon.o) here if you have one of these cards.
+	  named horizon) here if you have one of these cards.
 
 config ATM_HORIZON_DEBUG
 	bool "Enable debugging messages"
@@ -310,7 +310,7 @@ config ATM_IA
 	  UTP155, UTP25, DS3 and E3). Go to:
 	  	<http://www.iphase.com/products/ClassSheet.cfm?ClassID=ATM>
 	  for more info about the cards. Say Y (or M to compile as a module
-	  named iphase.o) here if you have one of these cards.
+	  named iphase) here if you have one of these cards.
 
 	  See the file <file:Documentation/networking/iphase.txt> for further
 	  details.
@@ -339,7 +339,7 @@ config ATM_FORE200E_MAYBE
 	  This is a driver for the FORE Systems 200E-series ATM adapter
 	  cards. It simultaneously supports PCA-200E and SBA-200E models
 	  on PCI and SBUS hosts. Say Y (or M to compile as a module
-	  named fore_200e.o) here if you have one of these ATM adapters.
+	  named fore_200e) here if you have one of these ATM adapters.
 
 	  Note that the driver will actually be compiled only if you
 	  additionally enable the support for PCA-200E and/or SBA-200E
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index dd50684e73d5..6d129e888ada 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -16,7 +16,7 @@ config BLK_DEV_FD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called floppy.o. If you want to compile it as a
+	  The module will be called floppy. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config AMIGA_FLOPPY
@@ -44,7 +44,7 @@ config BLK_DEV_PS2
 	  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/modules.txt>.  The module
-	  will be called ps2esdi.o.
+	  will be called ps2esdi.
 
 config AMIGA_Z2RAM
 	tristate "Amiga Zorro II ramdisk support"
@@ -54,7 +54,7 @@ config AMIGA_Z2RAM
 	  ramdisk or as a swap partition. Say Y if you want to include this
 	  driver in the kernel. This driver is also available as a module
 	  ( = code which can be inserted in and removed from the running
-	  kernel whenever you want). The module is called z2ram.o. If you want
+	  kernel whenever you want). The module is called z2ram. If you want
 	  to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
 
@@ -74,7 +74,7 @@ config ATARI_ACSI
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called acsi.o.
+	  The module will be called acsi.
 
 comment "Some devices (e.g. CD jukebox) support multiple LUNs"
 	depends on ATARI && ATARI_ACSI
@@ -98,7 +98,7 @@ config ATARI_SLM
 	  it in the kernel. Otherwise, say N. This driver is also available as
 	  a module ( = code which can be inserted in and removed from the
 	  running kernel whenever you want). The module will be called
-	  acsi_slm.o. Be warned: the driver needs much ST-RAM and can cause
+	  acsi_slm. Be warned: the driver needs much ST-RAM and can cause
 	  problems due to that fact!
 
 config BLK_DEV_XD
@@ -111,7 +111,7 @@ config BLK_DEV_XD
 	  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/modules.txt>. The module
-	  will be called xd.o.
+	  will be called xd.
 
 	  It's pretty unlikely that you have one of these: say N.
 
@@ -133,7 +133,7 @@ config PARIDE
 	  PARIDE as a module. If you built PARIDE support into your kernel,
 	  you may still build the individual protocol modules and high-level
 	  drivers as loadable modules. If you build this support as a module,
-	  it will be called paride.o.
+	  it will be called paride.
 
 	  To use the PARIDE support, you must say Y or M here and also to at
 	  least one high-level driver (e.g. "Parallel port IDE disks",
@@ -190,7 +190,7 @@ config BLK_DEV_DAC960
 	  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/modules.txt>.  The module
-	  will be called DAC960.o.
+	  will be called DAC960.
 
 config BLK_DEV_UMEM
 	tristate "Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)"
@@ -206,7 +206,7 @@ config BLK_DEV_UMEM
 	  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 Documentation/modules.txt. The module will be
-	  called umem.o.
+	  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
@@ -259,7 +259,7 @@ config BLK_DEV_LOOP
 	  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/modules.txt>. The module
-	  will be called loop.o.
+	  will be called loop.
 
 	  Most users will answer N here.
 
@@ -288,7 +288,7 @@ config BLK_DEV_NBD
 	  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/modules.txt>. The module
-	  will be called nbd.o.
+	  will be called nbd.
 
 	  If unsure, say N.
 
@@ -308,7 +308,7 @@ config BLK_DEV_RAM
 	  If you want to compile this as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want),
 	  say M and read <file:Documentation/modules.txt>. The module will be
-	  called rd.o.
+	  called rd.
 
 	  Most normal users won't need the RAM disk functionality, and can
 	  thus say N here.
diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig
index 6660645324ae..ff736d839507 100644
--- a/drivers/block/paride/Kconfig
+++ b/drivers/block/paride/Kconfig
@@ -21,7 +21,7 @@ config PARIDE_PD
 	  connected through a parallel port. If you chose to build PARIDE
 	  support into your kernel, you may answer Y here to build in the
 	  parallel port IDE driver, otherwise you should answer M to build
-	  it as a loadable module. The module will be called pd.o. You
+	  it as a loadable module. The module will be called pd. You
 	  must also have at least one parallel port protocol driver in your
 	  system. Among the devices supported by this driver are the SyQuest
 	  EZ-135, EZ-230 and SparQ drives, the Avatar Shark and the backpack
@@ -35,7 +35,7 @@ config PARIDE_PCD
 	  connected through a parallel port. If you chose to build PARIDE
 	  support into your kernel, you may answer Y here to build in the
 	  parallel port ATAPI CD-ROM driver, otherwise you should answer M to
-	  build it as a loadable module. The module will be called pcd.o. You
+	  build it as a loadable module. The module will be called pcd. You
 	  must also have at least one parallel port protocol driver in your
 	  system. Among the devices supported by this driver are the
 	  MicroSolutions backpack CD-ROM drives and the Freecom Power CD. If
@@ -51,7 +51,7 @@ config PARIDE_PF
 	  connected through a parallel port. If you chose to build PARIDE
 	  support into your kernel, you may answer Y here to build in the
 	  parallel port ATAPI disk driver, otherwise you should answer M
-	  to build it as a loadable module. The module will be called pf.o.
+	  to build it as a loadable module. The module will be called pf.
 	  You must also have at least one parallel port protocol driver in
 	  your system. Among the devices supported by this driver are the
 	  MicroSolutions backpack PD/CD drive and the Imation Superdisk
@@ -65,7 +65,7 @@ config PARIDE_PT
 	  connected through a parallel port. If you chose to build PARIDE
 	  support into your kernel, you may answer Y here to build in the
 	  parallel port ATAPI disk driver, otherwise you should answer M
-	  to build it as a loadable module. The module will be called pt.o.
+	  to build it as a loadable module. The module will be called pt.
 	  You must also have at least one parallel port protocol driver in
 	  your system. Among the devices supported by this driver is the
 	  parallel port version of the HP 5GB drive.
@@ -82,7 +82,7 @@ config PARIDE_PG
 	  If you chose to build PARIDE support into your kernel, you may
 	  answer Y here to build in the parallel port generic ATAPI driver,
 	  otherwise you should answer M to build it as a loadable module. The
-	  module will be called pg.o.
+	  module will be called pg.
 
 	  You must also have at least one parallel port protocol driver in
 	  your system.
@@ -106,7 +106,7 @@ config PARIDE_ATEN
 	  parallel port kits made in Hong Kong. If you chose to build PARIDE
 	  support into your kernel, you may answer Y here to build in the
 	  protocol driver, otherwise you should answer M to build it as a
-	  loadable module. The module will be called aten.o. You must also
+	  loadable module. The module will be called aten. You must also
 	  have a high-level driver for the type of device that you want to
 	  support.
 
@@ -125,7 +125,7 @@ config PARIDE_BPCK
 	  If you chose to build PARIDE support into your kernel, you may
 	  answer Y here to build in the protocol driver, otherwise you should
 	  answer M to build it as a loadable module.  The module will be
-	  called bpck.o.  You must also have a high-level driver for the type
+	  called bpck.  You must also have a high-level driver for the type
 	  of device that you want to support.
 
 config PARIDE_BPCK6
@@ -144,7 +144,7 @@ config PARIDE_BPCK6
 	  If you chose to build PARIDE support into your kernel, you may
 	  answer Y here to build in the protocol driver, otherwise you should
 	  answer M to build it as a loadable module.  The module will be
-	  called bpck6.o.  You must also have a high-level driver for the type
+	  called bpck6.  You must also have a high-level driver for the type
 	  of device that you want to support.
 
 config PARIDE_COMM
@@ -155,7 +155,7 @@ config PARIDE_COMM
 	  protocol from DataStor. If you chose to build PARIDE support
 	  into your kernel, you may answer Y here to build in the protocol
 	  driver, otherwise you should answer M to build it as a loadable
-	  module. The module will be called comm.o. You must also have
+	  module. The module will be called comm. You must also have
 	  a high-level driver for the type of device that you want to support.
 
 config PARIDE_DSTR
@@ -166,7 +166,7 @@ config PARIDE_DSTR
 	  protocol from DataStor. If you chose to build PARIDE support
 	  into your kernel, you may answer Y here to build in the protocol
 	  driver, otherwise you should answer M to build it as a loadable
-	  module. The module will be called dstr.o. You must also have
+	  module. The module will be called dstr. You must also have
 	  a high-level driver for the type of device that you want to support.
 
 config PARIDE_FIT2
@@ -178,7 +178,7 @@ config PARIDE_FIT2
 	  (low speed) adapter that is used in some portable hard drives. If
 	  you chose to build PARIDE support into your kernel, you may answer Y
 	  here to build in the protocol driver, otherwise you should answer M
-	  to build it as a loadable module. The module will be called ktti.o.
+	  to build it as a loadable module. The module will be called ktti.
 	  You must also have a high-level driver for the type of device that
 	  you want to support.
 
@@ -192,7 +192,7 @@ config PARIDE_FIT3
 	  devices. If you chose to build PARIDE support into your kernel, you
 	  may answer Y here to build in the protocol driver, otherwise you
 	  should answer M to build it as a loadable module. The module will be
-	  called fit3.o. You must also have a high-level driver for the type
+	  called fit3. You must also have a high-level driver for the type
 	  of device that you want to support.
 
 config PARIDE_EPAT
@@ -205,7 +205,7 @@ config PARIDE_EPAT
 	  Hewlett-Packard, SyQuest, Imation and Avatar. If you chose to build
 	  PARIDE support into your kernel, you may answer Y here to build in
 	  the protocol driver, otherwise you should answer M to build it as a
-	  loadable module. The module will be called epat.o. You must also
+	  loadable module. The module will be called epat. You must also
 	  have a high-level driver for the type of device that you want to
 	  support.
 
@@ -226,7 +226,7 @@ config PARIDE_EPIA
 	  found in some no-name kits. If you chose to build PARIDE support
 	  into your kernel, you may answer Y here to build in the protocol
 	  driver, otherwise you should answer M to build it as a loadable
-	  module. The module will be called epia.o. You must also have a
+	  module. The module will be called epia. You must also have a
 	  high-level driver for the type of device that you want to support.
 
 config PARIDE_FRIQ
@@ -238,7 +238,7 @@ config PARIDE_FRIQ
 	  drive.  If you chose to build PARIDE support into your kernel, you
 	  may answer Y here to build in the protocol driver, otherwise you
 	  should answer M to build it as a loadable module. The module will be
-	  called friq.o. You must also have a high-level driver for the type
+	  called friq. You must also have a high-level driver for the type
 	  of device that you want to support.
 
 config PARIDE_FRPW
@@ -249,7 +249,7 @@ config PARIDE_FRPW
 	  protocol. If you chose to build PARIDE support into your kernel, you
 	  may answer Y here to build in the protocol driver, otherwise you
 	  should answer M to build it as a loadable module. The module will be
-	  called frpw.o. You must also have a high-level driver for the type
+	  called frpw. You must also have a high-level driver for the type
 	  of device that you want to support.
 
 config PARIDE_KBIC
@@ -262,7 +262,7 @@ config PARIDE_KBIC
 	  especially in Europe. If you chose to build PARIDE support into your
 	  kernel, you may answer Y here to build in the protocol driver,
 	  otherwise you should answer M to build it as a loadable module. The
-	  module will be called kbic.o. You must also have a high-level driver
+	  module will be called kbic. You must also have a high-level driver
 	  for the type of device that you want to support.
 
 config PARIDE_KTTI
@@ -274,7 +274,7 @@ config PARIDE_KTTI
 	  used in some 2.5" portable hard drives. If you chose to build PARIDE
 	  support into your kernel, you may answer Y here to build in the
 	  protocol driver, otherwise you should answer M to build it as a
-	  loadable module. The module will be called ktti.o. You must also
+	  loadable module. The module will be called ktti. You must also
 	  have a high-level driver for the type of device that you want to
 	  support.
 
@@ -287,7 +287,7 @@ config PARIDE_ON20
 	  name). If you chose to build PARIDE support into your kernel, you
 	  may answer Y here to build in the protocol driver, otherwise you
 	  should answer M to build it as a loadable module. The module will
-	  be called on20.o. You must also have a high-level driver for the
+	  be called on20. You must also have a high-level driver for the
 	  type of device that you want to support.
 
 config PARIDE_ON26
@@ -299,7 +299,7 @@ config PARIDE_ON26
 	  name). If you chose to build PARIDE support into your kernel, you
 	  may answer Y here to build in the protocol driver, otherwise you
 	  should answer M to build it as a loadable module. The module will be
-	  called on26.o. You must also have a high-level driver for the type
+	  called on26. You must also have a high-level driver for the type
 	  of device that you want to support.
 
 #
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 4b5e6d2865b2..bdd3af1cbb8f 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -11,7 +11,7 @@ config BT_HCIUSB
 	  USB interface.
 
 	  Say Y here to compile support for Bluetooth USB devices into the
-	  kernel or say M to compile it as module (hci_usb.o).
+	  kernel or say M to compile it as module (hci_usb).
 
 config BT_USB_ZERO_PACKET
 	bool "USB zero packet support"
@@ -34,7 +34,7 @@ config BT_HCIUART
 	  adapter and BrainBoxes Bluetooth PC Card.
 
 	  Say Y here to compile support for Bluetooth UART devices into the
-	  kernel or say M to compile it as module (hci_uart.o).
+	  kernel or say M to compile it as module (hci_uart).
 
 config BT_HCIUART_H4
 	bool "UART (H4) protocol support"
@@ -68,7 +68,7 @@ config BT_HCIDTL1
 	  Socket Bluetooth CF Card
 
 	  Say Y here to compile support for HCI DTL1 devices into the
-	  kernel or say M to compile it as module (dtl1_cs.o).
+	  kernel or say M to compile it as module (dtl1_cs).
 
 config BT_HCIBT3C
 	tristate "HCI BT3C (PC Card) driver"
@@ -84,7 +84,7 @@ config BT_HCIBT3C
 	  the BlueFW package. For more information, see <http://bluez.sf.net>.
 
 	  Say Y here to compile support for HCI BT3C devices into the
-	  kernel or say M to compile it as module (bt3c_cs.o).
+	  kernel or say M to compile it as module (bt3c_cs).
 
 config BT_HCIBLUECARD
 	tristate "HCI BlueCard (PC Card) driver"
@@ -97,7 +97,7 @@ config BT_HCIBLUECARD
 	  Anycom Bluetooth CF Card
 
 	  Say Y here to compile support for HCI BlueCard devices into the
-	  kernel or say M to compile it as module (bluecard_cs.o).
+	  kernel or say M to compile it as module (bluecard_cs).
 
 config BT_HCIVHCI
 	tristate "HCI VHCI (Virtual HCI device) driver"
@@ -107,7 +107,7 @@ config BT_HCIVHCI
 	  This driver is required if you want to use HCI Emulation software.
 
 	  Say Y here to compile support for virtual HCI devices into the
-	  kernel or say M to compile it as module (hci_vhci.o).
+	  kernel or say M to compile it as module (hci_vhci).
 
 endmenu
 
diff --git a/drivers/cdrom/Kconfig b/drivers/cdrom/Kconfig
index fc6e4b1b2369..559d6b462db8 100644
--- a/drivers/cdrom/Kconfig
+++ b/drivers/cdrom/Kconfig
@@ -18,7 +18,7 @@ config AZTCD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aztcd.o.  If you want to compile it as a
+	  The module will be called aztcd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config GSCD
@@ -36,7 +36,7 @@ config GSCD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called gscd.o.  If you want to compile it as a
+	  The module will be called gscd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SBPCD
@@ -76,7 +76,7 @@ config SBPCD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sbpcd.o.  If you want to compile it as a
+	  The module will be called sbpcd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config MCD
@@ -101,7 +101,7 @@ config MCD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mcd.o. If you want to compile it as a
+	  The module will be called mcd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config MCD_IRQ
@@ -142,7 +142,7 @@ config MCDX
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mcdx.o. If you want to compile it as a
+	  The module will be called mcdx. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config OPTCD
@@ -161,7 +161,7 @@ config OPTCD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called optcd.o. If you want to compile it as a
+	  The module will be called optcd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config CM206
@@ -178,7 +178,7 @@ config CM206
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cm206.o. If you want to compile it as a
+	  The module will be called cm206. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SJCD
@@ -192,7 +192,7 @@ config SJCD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sjcd.o. If you want to compile it as a
+	  The module will be called sjcd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config ISP16_CDI
@@ -207,7 +207,7 @@ config ISP16_CDI
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called isp16.o. If you want to compile it as a
+	  The module will be called isp16. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config CDU31A
@@ -229,7 +229,7 @@ config CDU31A
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cdu31a.o.  If you want to compile it as a
+	  The module will be called cdu31a.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config CDU535
@@ -245,6 +245,6 @@ config CDU535
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sonycd535.o. If you want to compile it as
+	  The module will be called sonycd535. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 87401e06d651..d98a11175015 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -91,7 +91,7 @@ config COMPUTONE
 	  If you want to compile this 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/modules.txt>. You will get
-	  two modules called ip2.o and ip2main.o.
+	  two modules called ip2 and ip2main.
 
 config ROCKETPORT
 	tristate "Comtrol Rocketport support"
@@ -104,7 +104,7 @@ config ROCKETPORT
 
 	  If you want to compile this driver as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  rocket.o.
+	  rocket.
 
 config CYCLADES
 	tristate "Cyclades async mux support"
@@ -122,7 +122,7 @@ config CYCLADES
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called cyclades.o.
+	  will be called cyclades.
 
 	  If you haven't heard about it, it's safe to say N.
 
@@ -155,7 +155,7 @@ config DIGIEPCA
 	  one of the two drivers.
 
 	  If you want to compile this driver as a module, say M here and read
-	  <file:Documentation/modules.txt>. The module will be called epca.o.
+	  <file:Documentation/modules.txt>. The module will be called epca.
 
 config DIGI
 	tristate "Digiboard PC/Xx Support"
@@ -168,7 +168,7 @@ config DIGI
 	  Y here and read the file <file:Documentation/digiboard.txt>.
 
 	  If you want to compile this driver as a module, say M here and read
-	  <file:Documentation/modules.txt>. The module will be called pcxx.o.
+	  <file:Documentation/modules.txt>. The module will be called pcxx.
 
 config ESPSERIAL
 	tristate "Hayes ESP serial port support"
@@ -181,7 +181,7 @@ config ESPSERIAL
 	  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/modules.txt>.  The module will be
-	  called esp.o.  If unsure, say N.
+	  called esp.  If unsure, say N.
 
 config MOXA_INTELLIO
 	tristate "Moxa Intellio support"
@@ -191,7 +191,7 @@ config MOXA_INTELLIO
 
 	  This driver can also be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called moxa.o. If you want to do that, say M
+	  The module will be called moxa. If you want to do that, say M
 	  here.
 
 config MOXA_SMARTIO
@@ -202,7 +202,7 @@ config MOXA_SMARTIO
 
 	  This driver can also be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mxser.o. If you want to do that, say M
+	  The module will be called mxser. If you want to do that, say M
 	  here.
 
 config ISI
@@ -214,7 +214,7 @@ config ISI
 	  built as a module ( = code which can be inserted in and removed from
 	  the running kernel whenever you want).  Please read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  isicom.o.
+	  isicom.
 
 config SYNCLINK
 	tristate "Microgate SyncLink card support"
@@ -226,7 +226,7 @@ config SYNCLINK
 
 	  This driver can only be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called synclink.o.  If you want to do that, say M
+	  The module will be called synclink.  If you want to do that, say M
 	  here.
 
 config SYNCLINKMP
@@ -240,7 +240,7 @@ config SYNCLINKMP
 
 	  This driver may be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called synclinkmp.o.  If you want to do that, say M
+	  The module will be called synclinkmp.  If you want to do that, say M
 	  here.
 
 config N_HDLC
@@ -252,7 +252,7 @@ config N_HDLC
 
 	  This driver can only be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called n_hdlc.o. If you want to do that, say M
+	  The module will be called n_hdlc. If you want to do that, say M
 	  here.
 
 config RISCOM8
@@ -266,7 +266,7 @@ config RISCOM8
 	  say Y here and read the file <file:Documentation/riscom8.txt>.
 
 	  Also it's possible to say M here and compile this driver as kernel
-	  loadable module; the module will be called riscom8.o.
+	  loadable module; the module will be called riscom8.
 
 config SPECIALIX
 	tristate "Specialix IO8+ card support"
@@ -280,7 +280,7 @@ config SPECIALIX
 	  If you have a card like that, say Y here and read the file
 	  <file:Documentation/specialix.txt>. Also it's possible to say M here
 	  and compile this driver as kernel loadable module which will be
-	  called specialix.o.
+	  called specialix.
 
 config SPECIALIX_RTSCTS
 	bool "Specialix DTR/RTS pin is RTS"
@@ -301,7 +301,7 @@ config SX
 
 	  This driver can only be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sx.o. If you want to do that, say M here.
+	  The module will be called sx. If you want to do that, say M here.
 
 config RIO
 	tristate "Specialix RIO system support"
@@ -343,7 +343,7 @@ config STALLION
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called stallion.o.
+	  will be called stallion.
 
 config ISTALLION
 	tristate "Stallion EC8/64, ONboard, Brumby support"
@@ -356,7 +356,7 @@ config ISTALLION
 	  To compile it 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/modules.txt>. The module will be called
-	  istallion.o.
+	  istallion.
 
 config SERIAL_TX3912
 	bool "TMPTX3912/PR31700 serial port support"
@@ -430,9 +430,9 @@ config A2232
 	  for which 8 pin to DB25 adapters were supplied. The card also had
 	  jumpers internally to toggle various pinning configurations.
 
-	  This driver can be built as a module; but then "generic_serial.o"
+	  This driver can be built as a module; but then "generic_serial"
 	  will also be built as a module. This has to be loaded before
-	  "ser_a2232.o". If you want to do this, answer M here and read
+	  "ser_a2232". If you want to do this, answer M here and read
 	  "<file:Documentation/modules.txt>".
 
 source "drivers/serial/Kconfig"
@@ -495,7 +495,7 @@ config PRINTER
 	  driver as a module however ( = code which can be inserted in and
 	  removed from the running kernel whenever you want), say M here and
 	  read <file:Documentation/modules.txt> and
-	  <file:Documentation/parport.txt>.  The module will be called lp.o.
+	  <file:Documentation/parport.txt>.  The module will be called lp.
 
 	  If you have several parallel ports, you can specify which ports to
 	  use with the "lp" kernel command line option.  (Try "man bootparam"
@@ -539,7 +539,7 @@ config PPDEV
 	  This support is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  ppdev.o.
+	  ppdev.
 
 	  If unsure, say N.
 
@@ -558,7 +558,7 @@ config TIPAR
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tipar.o. If you want to compile it as a
+	  The module will be called tipar. If you want to compile it as a
 	  module, say M here and read Documentation/modules.txt.
 
 	  If you don't know what a parallel link cable is or what a Texas
@@ -598,7 +598,7 @@ config BUSMOUSE
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called busmouse.o. If you want to compile it as a
+	  The module will be called busmouse. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 endmenu
@@ -610,7 +610,7 @@ config QIC02_TAPE
 	  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/modules.txt>. The module will be called
-	  tpqic02.o.
+	  tpqic02.
 
 config QIC02_DYNCONF
 	bool "Do you want runtime configuration for QIC-02"
@@ -649,7 +649,7 @@ config DS1620
 	  found in the NetWinder. This driver allows the user to control the
 	  temperature set points and to read the current temperature.
 
-	  It is also possible to say M here to build it as a module (ds1620.o)
+	  It is also possible to say M here to build it as a module (ds1620)
 	  It is recommended to be used on a NetWinder, but it is not a
 	  necessity.
 
@@ -675,7 +675,7 @@ config NWBUTTON
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  nwbutton.o.
+	  nwbutton.
 
 	  Most people will answer Y to this question and "Reboot Using Button"
 	  below to be able to initiate a system shutdown from the button.
@@ -704,7 +704,7 @@ config NWFLASH
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called nwflash.o. If you want to compile it as a
+	  The module will be called nwflash. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 	  If you're not sure, say N.
@@ -723,7 +723,7 @@ config INTEL_RNG
 	  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/modules.txt>. The module will be called
-	  i810_rng.o.
+	  i810_rng.
 
 	  If unsure, say N.
 
@@ -741,7 +741,7 @@ config AMD_RNG
 	  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/modules.txt>. The module will be called
-	  amd768_rng.o.
+	  amd768_rng.
 
 	  If unsure, say N.
 
@@ -769,7 +769,7 @@ config NVRAM
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called nvram.o. If you want to compile it as a
+	  The module will be called nvram. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config RTC
@@ -797,7 +797,7 @@ config RTC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called rtc.o. If you want to compile it as a module,
+	  The module is called rtc. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 config GEN_RTC
@@ -817,7 +817,7 @@ config GEN_RTC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called genrtc.o. If you want to compile it as a module,
+	  The module is called genrtc. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>. To load the
 	  module automatically add 'alias char-major-10-135 genrtc' to your
 	  /etc/modules.conf
@@ -851,7 +851,7 @@ config DTLK
 	  called the `internal DoubleTalk'.  If you want to compile this 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/modules.txt>. The module will be called dtlk.o.
+	  <file:Documentation/modules.txt>. The module will be called dtlk.
 
 config R3964
 	tristate "Siemens R3964 line discipline"
@@ -863,7 +863,7 @@ config R3964
 	  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/modules.txt>. The module will be called
-	  n_r3964.o.
+	  n_r3964.
 
 	  If unsure, say N.
 
@@ -879,7 +879,7 @@ config APPLICOM
 	  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/modules.txt>. The module will be called
-	  applicom.o.
+	  applicom.
 
 	  If unsure, say N.
 
@@ -896,7 +896,7 @@ config SONYPI
 	  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/modules.txt>.  The module
-	  will be called sonypi.o.
+	  will be called sonypi.
 
 
 menu "Ftape, the floppy tape device driver"
@@ -927,7 +927,7 @@ config FTAPE
 	  module ( = code which can be inserted in and removed from the
 	  running kernel whenever you want). If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>. The
-	  module will be called ftape.o.
+	  module will be called ftape.
 
 	  Note that the Ftape-HOWTO is out of date (sorry) and documents the
 	  older version 2.08 of this software but still contains useful
@@ -973,7 +973,7 @@ config MWAVE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mwave.o. If you want to compile it as
+	  The module will be called mwave. If you want to compile it as
 	  a module, say M here and read Documentation/modules.txt.
 
 config SCx200_GPIO
@@ -983,7 +983,7 @@ config SCx200_GPIO
 	  Give userspace access to the GPIO pins on the National
 	  Semiconductor SCx200 processors.
 
-	  If compiled as a module, it will be called scx200_gpio.o.
+	  If compiled as a module, it will be called scx200_gpio.
 
 config RAW_DRIVER
 	tristate "RAW driver (/dev/raw/rawN)"
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index b68000d5da44..b934393cbc06 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -23,7 +23,7 @@ config AGP
 
 	  This driver is available as a module.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.  The
-	  module will be called agpgart.o.
+	  module will be called agpgart.
 
 config AGP_GART
 	bool "/dev/agpgart (AGP Support)"
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 404e8090a49e..9ffb421d76c8 100644
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -20,7 +20,7 @@ config DRM_TDFX
 	depends on DRM
 	help
 	  Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
-	  graphics card.  If M is selected, the module will be called tdfx.o.
+	  graphics card.  If M is selected, the module will be called tdfx.
 
 #    tristate '  3dlabs GMX 2000' CONFIG_DRM_GAMMA
 config DRM_R128
@@ -28,7 +28,7 @@ config DRM_R128
 	depends on DRM
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
-	  is selected, the module will be called r128.o.  AGP support for
+	  is selected, the module will be called r128.  AGP support for
 	  this card is strongly suggested (unless you have a PCI version).
 
 config DRM_RADEON
@@ -39,14 +39,14 @@ config DRM_RADEON
 	  are both PCI and AGP versions.  You don't need to choose this to
 	  run the Radeon in plain VGA mode.  There is a product page at
 	  <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
-	  If M is selected, the module will be called radeon.o.
+	  If M is selected, the module will be called radeon.
 
 config DRM_I810
 	tristate "Intel I810"
 	depends on DRM && AGP
 	help
 	  Choose this option if you have an Intel I810 graphics card.  If M is
-	  selected, the module will be called i810.o.  AGP support is required
+	  selected, the module will be called i810.  AGP support is required
 	  for this driver to work.
 
 config DRM_I830
@@ -58,6 +58,6 @@ config DRM_MGA
 	depends on DRM && AGP
 	help
 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
-	  card.  If M is selected, the module will be called mga.o.  AGP
+	  card.  If M is selected, the module will be called mga.  AGP
 	  support is required for this driver to work.
 
diff --git a/drivers/char/ftape/Kconfig b/drivers/char/ftape/Kconfig
index f4a0ff69eb82..df9f65e5de24 100644
--- a/drivers/char/ftape/Kconfig
+++ b/drivers/char/ftape/Kconfig
@@ -18,14 +18,14 @@ config ZFTAPE
 	  module ( = code which can be inserted in and removed from the
 	  running kernel whenever you want).  In this case you should read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  zftape.o.
+	  zftape.
 
 	  Regardless of whether you say Y or M here, an additional runtime
-	  loadable module called `zft-compressor.o' which contains code to
+	  loadable module called `zft-compressor' which contains code to
 	  support user transparent on-the-fly compression based on Ross
 	  William's lzrw3 algorithm will be produced.  If you have enabled the
 	  kernel module loader (i.e. have said Y to "Kernel module loader
-	  support", above) then `zft-compressor.o' will be loaded
+	  support", above) then `zft-compressor' will be loaded
 	  automatically by zftape when needed.
 
 	  Despite its name, zftape does NOT use compression by default.  The
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index 9d18890877f2..d22bfdc13563 100644
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -15,7 +15,7 @@ config SYNCLINK_CS
 
 	  This driver may be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called synclinkmp.o.  If you want to do that, say M
+	  The module will be called synclinkmp.  If you want to do that, say M
 	  here.
 
 endmenu
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index 454b26d1036f..edcc26b09b9d 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -50,7 +50,7 @@ config SOFT_WATCHDOG
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>. The module will be called
-	  softdog.o.
+	  softdog.
 
 config WDT
 	tristate "WDT Watchdog timer"
@@ -66,7 +66,7 @@ config WDT
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called wdt.o.
+	  will be called wdt.
 
 config WDTPCI
 	tristate "WDT PCI Watchdog timer"
@@ -82,7 +82,7 @@ config WDTPCI
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called wdt_pci.o.
+	  will be called wdt_pci.
 
 config WDT_501
 	bool "WDT501 features"
@@ -115,7 +115,7 @@ config PCWATCHDOG
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called pcwd.o. If you want to compile it as a module,
+	  The module is called pcwd. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  Most people will say N.
@@ -132,7 +132,7 @@ config ACQUIRE_WDT
 	  This driver is like the WDT501 driver but for different hardware.
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called pscwdt.o.  If you want to compile it as a
+	  The module is called pscwdt.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  Most
 	  people will say N.
 
@@ -150,7 +150,7 @@ config 21285_WATCHDOG
 	help
 	  The Intel Footbridge chip contains a builtin watchdog circuit. Say Y
 	  here if you wish to use this. Alternatively say M to compile the
-	  driver as a module, which will be called wdt285.o.
+	  driver as a module, which will be called wdt285.
 
 	  This driver does not work on all machines. In particular, early CATS
 	  boards have hardware problems that will cause the machine to simply
@@ -164,7 +164,7 @@ config 977_WATCHDOG
 	help
 	  Say Y here to include support for the WB977 watchdog included in
 	  NetWinder machines. Alternatively say M to compile the driver as
-	  a module, which will be called wdt977.o.
+	  a module, which will be called wdt977.
 
 	  Not sure? It's safe to say N.
 
@@ -179,7 +179,7 @@ config SA1100_WATCHDOG
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
-	  Documentation/modules.txt. The module will be called sa1100_wdt.o.
+	  Documentation/modules.txt. The module will be called sa1100_wdt.
 
 config EUROTECH_WDT
 	tristate "Eurotech CPU-1220/1410 Watchdog Timer"
@@ -202,7 +202,7 @@ config IB700_WDT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called ib700wdt.o. If you want to compile it as a
+	  The module is called ib700wdt. If you want to compile it as a
 	  module, say M here and read Documentation/modules.txt. Most people
 	  will say N.
 
@@ -225,7 +225,7 @@ config I810_TCO
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  i810-tco.o.
+	  i810-tco.
 
 config MIXCOMWD
 	tristate "Mixcom Watchdog"
@@ -238,7 +238,7 @@ config MIXCOMWD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called mixcomwd.o.  If you want to compile it as a
+	  The module is called mixcomwd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  Most
 	  people will say N.
 
@@ -249,7 +249,7 @@ config SCx200_WDT
 	  Enable the built-in watchdog timer support on the National 
 	  Semiconductor SCx200 processors.
 
-	  If compiled as a module, it will be called scx200_watchdog.o.
+	  If compiled as a module, it will be called scx200_watchdog.
 
 config 60XX_WDT
 	tristate "SBC-60XX Watchdog Timer"
@@ -263,7 +263,7 @@ config 60XX_WDT
 	  you can probably make this driver work with your card as well.
 
 	  You can compile this driver directly into the kernel, or use
-	  it as a module.  The module will be called sbc60xxwdt.o.
+	  it as a module.  The module will be called sbc60xxwdt.
 
 config W83877F_WDT
 	tristate "W83877F (EMACS) Watchdog Timer"
@@ -277,7 +277,7 @@ config W83877F_WDT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called mixcomwd.o.  If you want to compile it as a
+	  The module is called mixcomwd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  Most
 	  people will say N.
 
@@ -293,7 +293,7 @@ config MACHZ_WDT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called machzwd.o.  If you want to compile it as a
+	  The module is called machzwd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config W83877F_WDT
diff --git a/drivers/fc4/Kconfig b/drivers/fc4/Kconfig
index 906a60ca84f1..1062a7c09568 100644
--- a/drivers/fc4/Kconfig
+++ b/drivers/fc4/Kconfig
@@ -33,7 +33,7 @@ config FC4_SOC
 	  that if you have older firmware in the card, you'll need the
 	  microcode from the Solaris driver to make it work.
 
-	  This support is also available as a module called soc.o ( = code
+	  This support is also available as a module called soc ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -48,7 +48,7 @@ config FC4_SOCAL
 	  Interface Board). You'll probably need the microcode from the
 	  Solaris driver to make it work.
 
-	  This support is also available as a module called socal.o ( = code
+	  This support is also available as a module called socal ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -62,7 +62,7 @@ config SCSI_PLUTO
 	help
 	  If you never bought a disk array made by Sun, go with N.
 
-	  This support is also available as a module called pluto.o ( = code
+	  This support is also available as a module called pluto ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -76,7 +76,7 @@ config SCSI_FCAL
 	  common is either A5000 array or internal disks in E[3-6]000
 	  machines.
 
-	  This support is also available as a module called fcal.o ( = code
+	  This support is also available as a module called fcal ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>. If unsure, say N.
diff --git a/drivers/hotplug/Kconfig b/drivers/hotplug/Kconfig
index a65e171315d9..d5953bc186a7 100644
--- a/drivers/hotplug/Kconfig
+++ b/drivers/hotplug/Kconfig
@@ -16,7 +16,7 @@ config HOTPLUG_PCI
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pci_hotplug.o. If you want to compile it
+	  The module will be called pci_hotplug. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
@@ -30,7 +30,7 @@ config HOTPLUG_PCI_COMPAQ
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cpqphp.o. If you want to compile it
+	  The module will be called cpqphp. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
@@ -54,7 +54,7 @@ config HOTPLUG_PCI_IBM
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cpqphp.o. If you want to compile it
+	  The module will be called cpqphp. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
@@ -68,7 +68,7 @@ config HOTPLUG_PCI_ACPI
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called acpiphp.o. If you want to compile it
+	  The module will be called acpiphp. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
@@ -82,7 +82,7 @@ config HOTPLUG_PCI_CPCI
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cpci_hotplug.o. If you want to compile it
+	  The module will be called cpci_hotplug. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
@@ -96,7 +96,7 @@ config HOTPLUG_PCI_CPCI_ZT5550
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cpcihp_zt5550.o. If you want to compile it
+	  The module will be called cpcihp_zt5550. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
@@ -111,7 +111,7 @@ config HOTPLUG_PCI_CPCI_GENERIC
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cpcihp_generic.o. If you want to compile it
+	  The module will be called cpcihp_generic. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  When in doubt, say N.
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 071fdeb4de30..29a3ac06e4f2 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -27,7 +27,7 @@ config I2C
 	  This I2C support is also available as a module.  If you want to
 	  compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-core.o.
+	  The module will be called i2c-core.
 
 config I2C_ALGOBIT
 	tristate "I2C bit-banging interfaces"
@@ -40,7 +40,7 @@ config I2C_ALGOBIT
 	  This support is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-algo-bit.o.
+	  The module will be called i2c-algo-bit.
 
 config I2C_PHILIPSPAR
 	tristate "Philips style parallel port adapter"
@@ -52,7 +52,7 @@ config I2C_PHILIPSPAR
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-philips-par.o.
+	  The module will be called i2c-philips-par.
 
 	  Note that if you want support for different parallel port devices,
 	  life will be much easier if you compile them all as modules.
@@ -67,7 +67,7 @@ config I2C_ELV
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-elv.o.
+	  The module will be called i2c-elv.
 
 config I2C_VELLEMAN
 	tristate "Velleman K9000 adapter"
@@ -79,7 +79,7 @@ config I2C_VELLEMAN
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-velleman.o.
+	  The module will be called i2c-velleman.
 
 config SCx200_I2C
 	tristate "NatSemi SCx200 I2C using GPIO pins"
@@ -89,7 +89,7 @@ config SCx200_I2C
 
 	  If you don't know what to do here, say N.
 
-	  If compiled as a module, it will be called scx200_i2c.o.
+	  If compiled as a module, it will be called scx200_i2c.
 
 config SCx200_I2C_SCL
 	int "GPIO pin used for SCL"
@@ -115,7 +115,7 @@ config SCx200_ACB
 
 	  If you don't know what to do here, say N.
 
-	  If compiled as a module, it will be called scx200_acb.o.
+	  If compiled as a module, it will be called scx200_acb.
 
 config I2C_ALGOPCF
 	tristate "I2C PCF 8584 interfaces"
@@ -128,7 +128,7 @@ config I2C_ALGOPCF
 	  This support is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-algo-pcf.o.
+	  The module will be called i2c-algo-pcf.
 
 config I2C_ELEKTOR
 	tristate "Elektor ISA card"
@@ -140,7 +140,7 @@ config I2C_ELEKTOR
 	  This driver is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-elektor.o.
+	  The module will be called i2c-elektor.
 
 config ITE_I2C_ALGO
 	tristate "ITE I2C Algorithm"
@@ -194,7 +194,7 @@ config I2C_CHARDEV
 	  This code is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called i2c-dev.o.
+	  The module will be called i2c-dev.
 
 config I2C_PROC
 	tristate "I2C /proc interface (required for hardware sensors)"
@@ -205,7 +205,7 @@ config I2C_PROC
 
 	  This code is also available as a module. If you want to compile
 	  it as a module, say M here and read <file:Documentation/modules.txt>.
-	  The module will be called i2c-proc.o.
+	  The module will be called i2c-proc.
 
 	source drivers/i2c/busses/Kconfig
 	source drivers/i2c/chips/Kconfig
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 8750653989a9..dcd25b1c59c3 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -16,7 +16,7 @@ config I2C_AMD756
 	  while the kernel is running.  If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
-	  The module will be called i2c-amd756.o.
+	  The module will be called i2c-amd756.
 
 	  You will also need the latest user-space utilties: you can find them
 	  in the lm_sensors package, which you can download at 
@@ -33,7 +33,7 @@ config I2C_AMD8111
 	  while the kernel is running.  If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
-	  The module will be called i2c-amd8111.o.
+	  The module will be called i2c-amd8111.
 
 	  You will also need the latest user-space utilties: you can find them
 	  in the lm_sensors package, which you can download at 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 405db21a3a32..76058d89e053 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -16,7 +16,7 @@ config SENSORS_ADM1021
 	  be built as a module which can be inserted and removed while the 
 	  kernel is running.
 
-	  The module will be called adm1021.o.
+	  The module will be called adm1021.
 	  
 	  You will also need the latest user-space utilties: you can find them
 	  in the lm_sensors package, which you can download at 
@@ -31,7 +31,7 @@ config SENSORS_LM75
 	  TCN75, and National Semi LM77. This can also be built as a module
 	  which can be inserted and removed while the kernel is running.
 
-	  The module will be called lm75.o.
+	  The module will be called lm75.
 
 	  You will also need the latest user-space utilties: you can find them
 	  in the lm_sensors package, which you can download at 
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 1c6a6f840055..0f9b0783ed37 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -31,7 +31,7 @@ config BLK_DEV_IDE
 	  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/modules.txt> and
-	  <file:Documentation/ide.txt>. The module will be called ide-mod.o.
+	  <file:Documentation/ide.txt>. The module will be called ide-mod.
 	  Do not compile this driver as a module if your root file system (the
 	  one containing the directory /) is located on an IDE device.
 
@@ -77,7 +77,7 @@ config BLK_DEV_IDEDISK
 	  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/modules.txt>.  The module
-	  will be called ide-disk.o.  Do not compile this driver as a module
+	  will be called ide-disk.  Do not compile this driver as a module
 	  if your root file system (the one containing the directory /) is
 	  located on the IDE disk. If unsure, say Y.
 
@@ -136,7 +136,7 @@ config BLK_DEV_IDECD
 	  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/modules.txt>.  The module
-	  will be called ide-cd.o.
+	  will be called ide-cd.
 
 #dep_tristate '  Include IDE/ATAPI TAPE support' CONFIG_BLK_DEV_IDETAPE $CONFIG_BLK_DEV_IDE
 config BLK_DEV_IDEFLOPPY
@@ -162,7 +162,7 @@ config BLK_DEV_IDEFLOPPY
 	  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/modules.txt>.  The module
-	  will be called ide-floppy.o.
+	  will be called ide-floppy.
 
 config BLK_DEV_IDESCSI
 	tristate "SCSI emulation support"
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index dfe07c89e439..a2d18d9223c5 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -18,7 +18,7 @@ config IEEE1394
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called ieee1394.o.
+	  will be called ieee1394.
 
 comment "Subsystem Options"
 	depends on IEEE1394
@@ -67,7 +67,7 @@ config IEEE1394_PCILYNX
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called pcilynx.o.
+	  will be called pcilynx.
 
 # Non-maintained pcilynx options
 # if [ "$CONFIG_IEEE1394_PCILYNX" != "n" ]; then
@@ -87,7 +87,7 @@ config IEEE1394_OHCI1394
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called ohci1394.o.
+	  will be called ohci1394.
 
 comment "Protocol Drivers"
 	depends on IEEE1394
@@ -131,7 +131,7 @@ config IEEE1394_DV1394
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called dv1394.o.
+	  will be called dv1394.
 
 config IEEE1394_RAWIO
 	tristate "Raw IEEE1394 I/O support"
@@ -145,7 +145,7 @@ config IEEE1394_RAWIO
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called raw1394.o.
+	  will be called raw1394.
 
 config IEEE1394_CMP
 	tristate "IEC61883-1 Plug support"
@@ -157,7 +157,7 @@ config IEEE1394_CMP
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called amdtp.o.
+	  will be called amdtp.
 
 config IEEE1394_AMDTP
 	tristate "IEC61883-6 (Audio transmission) support"
@@ -172,6 +172,6 @@ config IEEE1394_AMDTP
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called amdtp.o.
+	  will be called amdtp.
 
 endmenu
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 51c4d0300f6a..7e6fcccb6d54 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -21,7 +21,7 @@ config INPUT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called input.o. If you want to compile it as a
+	  The module will be called input. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 comment "Userland interfaces"
@@ -41,7 +41,7 @@ config INPUT_MOUSEDEV
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mousedev.o. If you want to compile it as
+	  The module will be called mousedev. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_MOUSEDEV_PSAUX
@@ -82,7 +82,7 @@ config INPUT_JOYDEV
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called joydev.o. If you want to compile it as a
+	  The module will be called joydev. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_TSDEV
@@ -97,7 +97,7 @@ config INPUT_TSDEV
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tsdev.o. If you want to compile it as a
+	  The module will be called tsdev. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_TSDEV_SCREEN_X
@@ -119,7 +119,7 @@ config INPUT_EVDEV
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called evdev.o. If you want to compile it as a
+	  The module will be called evdev. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_EVBUG
@@ -136,7 +136,7 @@ config INPUT_EVBUG
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called joydev.o. If you want to compile it as a
+	  The module will be called joydev. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 comment "Input I/O drivers"
diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig
index 15398e3d219a..d7beafd0a43f 100644
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
@@ -18,7 +18,7 @@ config GAMEPORT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called gameport.o. If you want to compile it as
+	  The module will be called gameport. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SOUND_GAMEPORT
@@ -36,7 +36,7 @@ config GAMEPORT_NS558
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ns558.o. If you want to compile it as a
+	  The module will be called ns558. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config GAMEPORT_L4
@@ -47,7 +47,7 @@ config GAMEPORT_L4
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called lightning.o. If you want to compile it as
+	  The module will be called lightning. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config GAMEPORT_EMU10K1
@@ -59,7 +59,7 @@ config GAMEPORT_EMU10K1
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called emu10k1-gp.o. If you want to compile it as
+	  The module will be called emu10k1-gp. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config GAMEPORT_VORTEX
@@ -71,7 +71,7 @@ config GAMEPORT_VORTEX
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called vortex.o. If you want to compile it as a
+	  The module will be called vortex. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config GAMEPORT_FM801
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 29beebccdd18..8c3561a26068 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -29,7 +29,7 @@ config JOYSTICK_ANALOG
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called analog.o. If you want to compile it as a
+	  The module will be called analog. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_A3D
@@ -41,7 +41,7 @@ config JOYSTICK_A3D
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called a3d.o. If you want to compile it as a
+	  The module will be called a3d. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_ADI
@@ -53,7 +53,7 @@ config JOYSTICK_ADI
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called adi.o. If you want to compile it as a
+	  The module will be called adi. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_COBRA
@@ -64,7 +64,7 @@ config JOYSTICK_COBRA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cobra.o. If you want to compile it as a
+	  The module will be called cobra. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_GF2K
@@ -76,7 +76,7 @@ config JOYSTICK_GF2K
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called gf2k.o. If you want to compile it as a
+	  The module will be called gf2k. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_GRIP
@@ -88,7 +88,7 @@ config JOYSTICK_GRIP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called grip.o. If you want to compile it as a
+	  The module will be called grip. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_GRIP_MP
@@ -100,7 +100,7 @@ config JOYSTICK_GRIP_MP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called grip_mp.o. If you want to compile it as a
+	  The module will be called grip_mp. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_GUILLEMOT
@@ -112,7 +112,7 @@ config JOYSTICK_GUILLEMOT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called guillemot.o. If you want to compile it as a
+	  The module will be called guillemot. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_INTERACT
@@ -124,7 +124,7 @@ config JOYSTICK_INTERACT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called interact.o. If you want to compile it as
+	  The module will be called interact. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_SIDEWINDER
@@ -136,7 +136,7 @@ config JOYSTICK_SIDEWINDER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sidewinder.o. If you want to compile it
+	  The module will be called sidewinder. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_TMDC
@@ -148,7 +148,7 @@ config JOYSTICK_TMDC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tmdc.o. If you want to compile it as a
+	  The module will be called tmdc. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 source "drivers/input/joystick/iforce/Kconfig"
@@ -162,7 +162,7 @@ config JOYSTICK_WARRIOR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called warrior.o. If you want to compile it as a
+	  The module will be called warrior. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_MAGELLAN
@@ -174,7 +174,7 @@ config JOYSTICK_MAGELLAN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called magellan.o. If you want to compile it as
+	  The module will be called magellan. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_SPACEORB
@@ -186,7 +186,7 @@ config JOYSTICK_SPACEORB
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called spaceorb.o. If you want to compile it as
+	  The module will be called spaceorb. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_SPACEBALL
@@ -199,7 +199,7 @@ config JOYSTICK_SPACEBALL
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called spaceball.o. If you want to compile it as
+	  The module will be called spaceball. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_STINGER
@@ -211,7 +211,7 @@ config JOYSTICK_STINGER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called stinger.o. If you want to compile it as a
+	  The module will be called stinger. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_TWIDDLER
@@ -223,7 +223,7 @@ config JOYSTICK_TWIDDLER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called twidjoy.o. If you want to compile it as a
+	  The module will be called twidjoy. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_DB9
@@ -238,7 +238,7 @@ config JOYSTICK_DB9
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called db9.o. If you want to compile it as a
+	  The module will be called db9. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_GAMECON
@@ -254,7 +254,7 @@ config JOYSTICK_GAMECON
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called gamecon.o. If you want to compile it as a
+	  The module will be called gamecon. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_TURBOGRAFX
@@ -268,7 +268,7 @@ config JOYSTICK_TURBOGRAFX
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called turbografx.o. If you want to compile it
+	  The module will be called turbografx. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_AMIGA
@@ -280,7 +280,7 @@ config JOYSTICK_AMIGA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called amijoy.o. If you want to compile it as
+	  The module will be called amijoy. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_JOYDUMP
@@ -293,6 +293,6 @@ config INPUT_JOYDUMP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called joydump.o. If you want to compile it as
+	  The module will be called joydump. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/input/joystick/iforce/Kconfig b/drivers/input/joystick/iforce/Kconfig
index 7e7457ceb137..c0143823c073 100644
--- a/drivers/input/joystick/iforce/Kconfig
+++ b/drivers/input/joystick/iforce/Kconfig
@@ -11,7 +11,7 @@ config JOYSTICK_IFORCE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called iforce.o. If you want to compile it as a
+	  The module will be called iforce. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config JOYSTICK_IFORCE_USB
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index bb6e74235a7c..de31b9cc99f7 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -25,7 +25,7 @@ config KEYBOARD_ATKBD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called atkbd.o. If you want to compile it as a
+	  The module will be called atkbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config KEYBOARD_SUNKBD
@@ -38,7 +38,7 @@ config KEYBOARD_SUNKBD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sunkbd.o. If you want to compile it as a
+	  The module will be called sunkbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config KEYBOARD_XTKBD
@@ -52,7 +52,7 @@ config KEYBOARD_XTKBD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called xtkbd.o. If you want to compile it as a
+	  The module will be called xtkbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config KEYBOARD_NEWTON
@@ -63,7 +63,7 @@ config KEYBOARD_NEWTON
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called maple_keyb.o. If you want to compile it as a
+	  The module will be called maple_keyb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config KEYBOARD_MAPLE
@@ -75,7 +75,7 @@ config KEYBOARD_MAPLE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called maple_keyb.o. If you want to compile it as a
+	  The module will be called maple_keyb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config KEYBOARD_AMIGA
@@ -87,6 +87,6 @@ config KEYBOARD_AMIGA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called amikbd.o. If you want to compile it as a
+	  The module will be called amikbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 85f0aa028e41..9f2772a32d69 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -23,7 +23,7 @@ config INPUT_PCSPKR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pcspkr.o. If you want to compile it as a
+	  The module will be called pcspkr. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_SPARCSPKR
@@ -37,7 +37,7 @@ config INPUT_SPARCSPKR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pcspkr.o. If you want to compile it as a
+	  The module will be called pcspkr. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config INPUT_M68K_BEEP
@@ -53,7 +53,7 @@ config INPUT_UINPUT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called uinput.o.  If you want to compile it as a
+	  The module will be called uinput.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.	    
 
 config INPUT_GSC
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 3196bd6e8c79..b249e5249334 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -25,7 +25,7 @@ config MOUSE_PS2
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called psmouse.o. If you want to compile it as a
+	  The module will be called psmouse. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config MOUSE_SERIAL
@@ -40,7 +40,7 @@ config MOUSE_SERIAL
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sermouse.o. If you want to compile it as a
+	  The module will be called sermouse. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config MOUSE_INPORT
@@ -52,7 +52,7 @@ config MOUSE_INPORT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called inport.o. If you want to compile it as a
+	  The module will be called inport. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
 
 config MOUSE_ATIXL
@@ -70,7 +70,7 @@ config MOUSE_LOGIBM
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called logibm.o. If you want to compile it as a
+	  The module will be called logibm. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
 
 config MOUSE_PC110PAD
@@ -82,7 +82,7 @@ config MOUSE_PC110PAD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pc110pad.o. If you want to compile it as a
+	  The module will be called pc110pad. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
 
 config MOUSE_MAPLE
@@ -94,7 +94,7 @@ config MOUSE_MAPLE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called maplemouse.o. If you want to compile it as a
+	  The module will be called maplemouse. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
 
 config MOUSE_AMIGA
@@ -106,7 +106,7 @@ config MOUSE_AMIGA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called amimouse.o. If you want to compile it as a
+	  The module will be called amimouse. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
 
 config MOUSE_RISCPC
@@ -118,6 +118,6 @@ config MOUSE_RISCPC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called rpcmouse.o. If you want to compile it as a
+	  The module will be called rpcmouse. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
 
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 250666e78173..6901dbb8a23f 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -15,7 +15,7 @@ config SERIO
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called serio.o. If you want to compile it
+	  The module will be called serio. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config SERIO_I8042
@@ -31,7 +31,7 @@ config SERIO_I8042
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called i8042.o. If you want to compile it
+	  The module will be called i8042. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config SERIO_SERPORT
@@ -48,7 +48,7 @@ config SERIO_SERPORT
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called serport.o. If you want to compile it as a
+	  The module will be called serport. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SERIO_CT82C710
@@ -63,7 +63,7 @@ config SERIO_CT82C710
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ct82c710.o. If you want to compile it as a
+	  The module will be called ct82c710. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SERIO_Q40KBD
@@ -83,7 +83,7 @@ config SERIO_PARKBD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called parkbd.o. If you want to compile it as a
+	  The module will be called parkbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SERIO_RPCKBD
@@ -96,7 +96,7 @@ config SERIO_RPCKBD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called rpckbd.o. If you want to compile it as a
+	  The module will be called rpckbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SERIO_AMBAKMI
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6823af8eae36..7201dc6c10b8 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -20,7 +20,7 @@ config TOUCHSCREEN_BITSY
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called gunze.o. If you want to compile it as a
+	  The module will be called gunze. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config TOUCHSCREEN_GUNZE
@@ -34,6 +34,6 @@ config TOUCHSCREEN_GUNZE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called gunze.o. If you want to compile it as a
+	  The module will be called gunze. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig
index 4ad33acb202c..1ad00bbf94da 100644
--- a/drivers/isdn/hysdn/Kconfig
+++ b/drivers/isdn/hysdn/Kconfig
@@ -6,7 +6,7 @@ config HYSDN
 	depends on m && PROC_FS
 	help
 	  Say Y here if you have one of Hypercope's active PCI ISDN cards
-	  Champ, Ergo and Metro. You will then get a module called hysdn.o.
+	  Champ, Ergo and Metro. You will then get a module called hysdn.
 	  Please read the file <file:Documentation/isdn/README.hysdn> for more
 	  information.
 
diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig
index 48ced0506ab8..4a82068a0931 100644
--- a/drivers/isdn/sc/Kconfig
+++ b/drivers/isdn/sc/Kconfig
@@ -9,6 +9,6 @@ config ISDN_DRV_SC
 	  driver currently builds only in a modularized version ( = code which
 	  can be inserted in and removed from the running kernel whenever you
 	  want, details in <file:Documentation/modules.txt>); the module will
-	  be called sc.o.  See <file:Documentation/isdn/README.sc> and
+	  be called sc.  See <file:Documentation/isdn/README.sc> and
 	  <http://www.spellcast.com/> for more information.
 
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 7a307bf1307a..92e90794763b 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -41,7 +41,7 @@ config MD_LINEAR
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called linear.o.
+	  will be called linear.
 
 	  If unsure, say Y.
 
@@ -63,7 +63,7 @@ config MD_RAID0
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called raid0.o.
+	  will be called raid0.
 
 	  If unsure, say Y.
 
@@ -85,7 +85,7 @@ config MD_RAID1
 	  learn where to get the supporting user space utilities raidtools.
 
 	  If you want to use such a RAID-1 set, say Y. This code is also
-	  available as a module called raid1.o ( = code which can be inserted
+	  available as a module called raid1 ( = code which can be inserted
 	  in and removed from the running kernel whenever you want).  If you
 	  want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
@@ -110,7 +110,7 @@ config MD_RAID5
 	  learn where to get the supporting user space utilities raidtools.
 
 	  If you want to use such a RAID-4/RAID-5 set, say Y. This code is
-	  also available as a module called raid5.o ( = code which can be
+	  also available as a module called raid5 ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
@@ -141,7 +141,7 @@ config BLK_DEV_DM
 	  Higher level volume managers such as LVM2 use this driver.
 
 	  If you want to compile this as a module, say M here and read 
-	  <file:Documentation/modules.txt>.  The module will be called dm-mod.o.
+	  <file:Documentation/modules.txt>.  The module will be called dm-mod.
 
 	  If unsure, say N.
 
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 6eba27933424..1c9e301d25c9 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -21,7 +21,7 @@ config VIDEO_DEV
 	  Documentation/video4linux/API.html.  Documentation for V4L2 is
 	  available on the web at http://bytesex.org/v4l/
 
-	  This driver is also available as a module called videodev.o ( = code
+	  This driver is also available as a module called videodev ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 3e7f3583a5a7..98b9a7d48e5e 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -31,7 +31,7 @@ config DVB_ALPS_TDLB7
 
 	  This tuner module needs some microcode located in a file called 
 	  "Sc_main.mc" in the windows driver. Please pass the module parameter
-	  mcfile="/PATH/FILENAME" when loading alps_tdlb7.o.
+	  mcfile="/PATH/FILENAME" when loading alps_tdlb7.
 
 	  If you don't know what tuner module is soldered on your 
 	  DVB adapter simply enable all supported frontends, the 
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index d1c0e02d81f8..1f23c99d2cdf 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -23,7 +23,7 @@ config RADIO_CADET
 	  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/modules.txt>.  The module
-	  will be called radio-cadet.o.
+	  will be called radio-cadet.
 
 config RADIO_RTRACK
 	tristate "AIMSlab RadioTrack (aka RadioReveal) support"
@@ -51,7 +51,7 @@ config RADIO_RTRACK
 	  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/modules.txt>.  The module
-	  will be called radio-aimslab.o.
+	  will be called radio-aimslab.
 
 config RADIO_RTRACK_PORT
 	hex "RadioTrack i/o port (0x20f or 0x30f)"
@@ -76,7 +76,7 @@ config RADIO_RTRACK2
 	  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/modules.txt>.  The module
-	  will be called radio-rtrack2.o.
+	  will be called radio-rtrack2.
 
 config RADIO_RTRACK2_PORT
 	hex "RadioTrack II i/o port (0x20c or 0x30c)"
@@ -101,7 +101,7 @@ config RADIO_AZTECH
 	  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/modules.txt>.  The module
-	  will be called radio-aztech.o.
+	  will be called radio-aztech.
 
 config RADIO_AZTECH_PORT
 	hex "Aztech/Packard Bell I/O port (0x350 or 0x358)"
@@ -127,7 +127,7 @@ config RADIO_GEMTEK
 	  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/modules.txt>.  The module
-	  will be called radio-gemtek.o.
+	  will be called radio-gemtek.
 
 config RADIO_GEMTEK_PORT
 	hex "GemTek i/o port (0x20c, 0x30c, 0x24c or 0x34c)"
@@ -153,7 +153,7 @@ config RADIO_GEMTEK_PCI
 	  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/modules.txt>.  The module
-	  will be called radio-gemtek-pci.o.
+	  will be called radio-gemtek-pci.
 
 config RADIO_MAXIRADIO
 	tristate "Guillemot MAXI Radio FM 2000 radio"
@@ -170,7 +170,7 @@ config RADIO_MAXIRADIO
 	  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/modules.txt>.  The module
-	  will be called radio-maxiradio.o.
+	  will be called radio-maxiradio.
 
 config RADIO_MAESTRO
 	tristate "Maestro on board radio"
@@ -187,7 +187,7 @@ config RADIO_MAESTRO
 	  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/modules.txt>.  The module
-	  will be called radio-maestro.o.
+	  will be called radio-maestro.
 
 config RADIO_MIROPCM20
 	tristate "miroSOUND PCM20 radio"
@@ -205,7 +205,7 @@ config RADIO_MIROPCM20
 	  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/modules.txt>.  The module
-	  will be called miropcm20.o.
+	  will be called miropcm20.
 
 config RADIO_MIROPCM20_RDS
 	tristate "miroSOUND PCM20 radio RDS user interface (EXPERIMENTAL)"
@@ -221,7 +221,7 @@ config RADIO_MIROPCM20_RDS
 	  availability of RDS is reported over V4L by the basic driver
 	  already.  Here RDS can be read from files in /dev/v4l/rds.
 
-	  As module the driver will be called miropcm20-rds.o.
+	  As module the driver will be called miropcm20-rds.
 
 config RADIO_SF16FMI
 	tristate "SF16FMI Radio"
@@ -240,7 +240,7 @@ config RADIO_SF16FMI
 	  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/modules.txt>.  The module
-	  will be called radio-sf16fmi.o.
+	  will be called radio-sf16fmi.
 
 config RADIO_TERRATEC
 	tristate "TerraTec ActiveRadio ISA Standalone"
@@ -263,7 +263,7 @@ config RADIO_TERRATEC
 	  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/modules.txt>.  The module
-	  will be called radio-terratec.o.
+	  will be called radio-terratec.
 
 config RADIO_TERRATEC_PORT
 	hex "Terratec i/o port (normally 0x590)"
@@ -280,7 +280,7 @@ config RADIO_TRUST
 	  This is a driver for the Trust FM radio cards. Say Y if you have
 	  such a card and want to use it under Linux.
 
-	  This driver is also available as a module called radio-trust.o ( =
+	  This driver is also available as a module called radio-trust ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -308,7 +308,7 @@ config RADIO_TYPHOON
 	  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/modules.txt>.  The module
-	  will be called radio-typhoon.o.
+	  will be called radio-typhoon.
 
 config RADIO_TYPHOON_PROC_FS
 	bool "Support for /proc/radio-typhoon"
@@ -354,7 +354,7 @@ config RADIO_ZOLTRIX
 	  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/modules.txt>.  The module
-	  will be called radio-zoltrix.o.
+	  will be called radio-zoltrix.
 
 config RADIO_ZOLTRIX_PORT
 	hex "ZOLTRIX I/O port (0x20c or 0x30c)"
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 099285f654de..8e5e36e797ad 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -28,7 +28,7 @@ config VIDEO_BT848
 	  If you say Y or M here, you need to say Y or M to "I2C support" and
 	  "I2C bit-banging interfaces" in the character device section.
 
-	  This driver is available as a module called bttv.o ( = code
+	  This driver is available as a module called bttv ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -38,7 +38,7 @@ config VIDEO_PMS
 	depends on VIDEO_DEV
 	help
 	  Say Y if you have such a thing.  This driver is also available as a
-	  module called pms.o ( = code which can be inserted in and removed
+	  module called pms ( = code which can be inserted in and removed
 	  from the running kernel whenever you want).  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
@@ -52,7 +52,7 @@ config VIDEO_PLANB
 	  Otherwise, or if you don't understand a word, say N.
 	  See <http://www.cpu.lu/~mlan/planb.html> for more info.
 
-	  Saying M will compile this driver as a module (planb.o).
+	  Saying M will compile this driver as a module (planb).
 
 config VIDEO_BWQCAM
 	tristate "Quickcam BW Video For Linux"
@@ -61,7 +61,7 @@ config VIDEO_BWQCAM
 	  Say Y have if you the black and white version of the QuickCam
 	  camera. See the next option for the color version.
 
-	  This driver is also available as a module called bw-qcam.o ( = code
+	  This driver is also available as a module called bw-qcam ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -74,7 +74,7 @@ config VIDEO_CQCAM
 	  Connectix QuickCam.  If you have one of these cameras, say Y here,
 	  otherwise say N.  This driver does not work with the original
 	  monochrome QuickCam, QuickCam VC or QuickClip.  It is also available
-	  as a module (c-qcam.o).
+	  as a module (c-qcam).
 	  Read <file:Documentation/video4linux/CQcam.txt> for more information.
 
 config VIDEO_W9966
@@ -85,7 +85,7 @@ config VIDEO_W9966
 	  Currently tested with the LifeView FlyCam Supra.
 	  If you have one of these cameras, say Y here
 	  otherwise say N.
-	  This driver is also available as a module (w9966.o).
+	  This driver is also available as a module (w9966).
 
 	  Check out <file:Documentation/video4linux/w9966.txt> for more
 	  information.
@@ -103,7 +103,7 @@ config VIDEO_CPIA
 	  Please read <file:Documentation/video4linux/README.cpia> for more
 	  information.
 
-	  This driver is also available as a module (cpia.o).
+	  This driver is also available as a module (cpia).
 
 config VIDEO_CPIA_PP
 	tristate "CPiA Parallel Port Lowlevel Support"
@@ -113,7 +113,7 @@ config VIDEO_CPIA_PP
 	  Vision's CPiA (Colour Processor Interface ASIC), such as the
 	  Creative Webcam II. If you have the parallel port version of one
 	  of these cameras, say Y here, otherwise say N. It is also available
-	  as a module (cpia_pp.o).
+	  as a module (cpia_pp).
 
 config VIDEO_CPIA_USB
 	tristate "CPiA USB Lowlevel Support"
@@ -123,7 +123,7 @@ config VIDEO_CPIA_USB
 	  (Colour Processor Interface ASIC), such as the Creative Webcam II.
 	  If you have the USB version of one of these cameras, say Y here,
 	  otherwise say N. This will not work with the Creative Webcam III.
-	  It is also available as a module (cpia_usb.o).
+	  It is also available as a module (cpia_usb).
 
 config VIDEO_SAA5249
 	tristate "SAA5249 Teletext processor"
@@ -132,7 +132,7 @@ config VIDEO_SAA5249
 	  Support for I2C bus based teletext using the SAA5249 chip. At the
 	  moment this is only useful on some European WinTV cards.
 
-	  This driver is also available as a module called saa5249.o ( = code
+	  This driver is also available as a module called saa5249 ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -197,7 +197,7 @@ config VIDEO_ZR36120
 	  and Buster boards. Please read the material in
 	  <file:Documentation/video4linux/zr36120.txt> for more information.
 
-	  This driver is also available as a module called zr36120.o ( = code
+	  This driver is also available as a module called zr36120 ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -213,7 +213,7 @@ config VIDEO_MEYE
 	  If you say Y or M here, you need to say Y or M to "Sony Programmable
 	  I/O Control Device" in the character device section.
 
-	  This driver is available as a module called meye.o ( = code
+	  This driver is available as a module called meye ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -225,7 +225,7 @@ config VIDEO_SAA7134
 	  This is a video4linux driver for Philips SAA7130/7134 based
 	  TV cards.
 
-	  This driver is available as a module called saa7134.o ( = code
+	  This driver is available as a module called saa7134 ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
index e482a6b7ca9e..7e9ecbc8d59c 100644
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
@@ -21,10 +21,10 @@ config FUSION
 
 	  If you have Fusion MPT hardware and want to use it, you can say
 	  Y or M here to add MPT (base + ScsiHost) drivers.
-	  <Y> = build lib (fusion.o), and link [static] into the kernel [2]
+	  <Y> = build lib (fusion), and link [static] into the kernel [2]
 	  proper
-	  <M> = compiled as [dynamic] modules [3] named: (mptbase.o,
-	  mptscsih.o)
+	  <M> = compiled as [dynamic] modules [3] named: (mptbase,
+	  mptscsih)
 
 	  [2] In order enable capability to boot the linux kernel
 	  natively from a Fusion MPT target device, you MUST
@@ -39,9 +39,9 @@ config FUSION
 
 	  If you say Y or M here you will get a choice of these
 	  additional protocol and support module options:         Module Name:
-	  <M>   Enhanced SCSI error reporting                     (isense.o)
-	  <M>   Fusion MPT misc device (ioctl) driver             (mptctl.o)
-	  <M>   Fusion MPT LAN driver                             (mptlan.o)
+	  <M>   Enhanced SCSI error reporting                     (isense)
+	  <M>   Fusion MPT misc device (ioctl) driver             (mptctl)
+	  <M>   Fusion MPT LAN driver                             (mptlan)
 
 	  ---
 	  Fusion MPT is trademark of LSI Logic Corporation, and its
@@ -95,7 +95,7 @@ config FUSION_ISENSE
 	  ASC/ASCQ=29h/00h "LOGICAL UNIT NOT READY, INITIALIZING CMD. REQUIRED"
 
 	  Say M for "Enhanced SCSI error reporting" to compile this optional module,
-	  creating a driver named: isense.o.
+	  creating a driver named: isense.
 
 	  NOTE: Support for building this feature into the kernel is not
 	  available, due to kernel size considerations.
@@ -114,7 +114,7 @@ config FUSION_CTL
 	  of the MPT adapter firmware.  Refer to readme file(s) distributed
 	  with the Fusion MPT linux driver for additional details.
 
-	  If enabled by saying M to this, a driver named: mptctl.o
+	  If enabled by saying M to this, a driver named: mptctl
 	  will be compiled.
 
 	  If unsure whether you really want or need this, say N.
@@ -131,7 +131,7 @@ config FUSION_LAN
 	  Installing this driver requires the knowledge to configure and
 	  activate a new network interface, "fc0", using standard Linux tools.
 
-	  If enabled by saying M to this, a driver named: mptlan.o
+	  If enabled by saying M to this, a driver named: mptlan
 	  will be compiled.
 
 	  If unsure whether you really want or need this, say N.
diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index 3b7a061de441..06c231e1867a 100644
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -22,7 +22,7 @@ config I2O
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  You will get modules called
-	  i2o_core.o and i2o_config.o.
+	  i2o_core and i2o_config.
 
 	  If unsure, say N.
 
@@ -33,7 +33,7 @@ config I2O_PCI
 	  Say Y for support of PCI bus I2O interface adapters. Currently this
 	  is the only variety supported, so you should say Y.
 
-	  This support is also available as a module called i2o_pci.o ( = code
+	  This support is also available as a module called i2o_pci ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -45,7 +45,7 @@ config I2O_BLOCK
 	  Include support for the I2O Block OSM. The Block OSM presents disk
 	  and other structured block devices to the operating system.
 
-	  This support is also available as a module called i2o_block.o ( =
+	  This support is also available as a module called i2o_block ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -58,7 +58,7 @@ config I2O_LAN
 	  support for token ring or FDDI if you wish to use token ring or FDDI
 	  I2O cards with this driver.
 
-	  This support is also available as a module called i2o_lan.o ( = code
+	  This support is also available as a module called i2o_lan ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -71,7 +71,7 @@ config I2O_SCSI
 	  I2O controller. You can use both the SCSI and Block OSM together if
 	  you wish.
 
-	  This support is also available as a module called i2o_scsi.o ( =
+	  This support is also available as a module called i2o_scsi ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -84,7 +84,7 @@ config I2O_PROC
 	  able to read I2O related information from the virtual directory
 	  /proc/i2o.
 
-	  This support is also available as a module called i2o_proc.o ( =
+	  This support is also available as a module called i2o_proc ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index ce3e6280d296..109df882cccb 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -137,7 +137,7 @@ config MTD_SCx200_DOCFLASH
 
 	  If you don't know what to do here, say N.
 
-	  If compiled as a module, it will be called scx200_docflash.o.
+	  If compiled as a module, it will be called scx200_docflash.
 
 config MTD_L440GX
 	tristate "BIOS flash chip on Intel L440GX boards"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 49d1b678ba27..3d4c4d08a5e2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -55,7 +55,7 @@ config DUMMY
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called dummy.o.  If you want to use more than one dummy
+	  will be called dummy.  If you want to use more than one dummy
 	  device at a time, you need to compile this driver as a module.
 	  Instead of 'dummy', the devices will then be called 'dummy0',
 	  'dummy1' etc.
@@ -80,7 +80,7 @@ config BONDING
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called bonding.o.
+	  will be called bonding.
 
 config EQUALIZER
 	tristate "EQL (serial line load balancing) support"
@@ -101,7 +101,7 @@ config EQUALIZER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called eql.o.  If you want to compile it as a
+	  The module will be called eql.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -125,7 +125,7 @@ config TUN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tun.o.  If you want to compile it as a
+	  The module will be called tun.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 	  If you don't know what to use this for, you don't need it.
@@ -150,7 +150,7 @@ config ETHERTAP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ethertap.o. If you want to compile it as a
+	  The module will be called ethertap. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 	  If you don't know what to use this for, you don't need it.
@@ -167,7 +167,7 @@ config NET_SB1000
 	  provided by your regular phone modem.
 
 	  At present this driver only compiles as a module, so say M here if
-	  you have this card. The module will be called sb1000.o. Then read
+	  you have this card. The module will be called sb1000. Then read
 	  <file:Documentation/networking/README.sb1000> for information on how
 	  to use this module, as it needs special ppp scripts for establishing
 	  a connection. Further documentation and the necessary scripts can be
@@ -237,7 +237,7 @@ config MACE
 	  motherboard will usually use a MACE (Medium Access Control for
 	  Ethernet) interface. Say Y to include support for the MACE chip.
 
-	  This driver is also available as a module called mace.o ( = code
+	  This driver is also available as a module called mace ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -260,7 +260,7 @@ config BMAC
 	  Say Y for support of BMAC Ethernet interfaces. These are used on G3
 	  computers.
 
-	  This driver is also available as a module called bmac.o ( = code
+	  This driver is also available as a module called bmac ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -271,7 +271,7 @@ config OAKNET
 	help
 	  Say Y if your machine has this type of Ethernet network card.
 
-	  This driver is also available as a module called oaknet.o ( = code
+	  This driver is also available as a module called oaknet ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -285,7 +285,7 @@ config ARIADNE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you
-	  want). The module is called ariadne.o. If you want to compile it as
+	  want). The module is called ariadne. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config ARIADNE2
@@ -298,7 +298,7 @@ config ARIADNE2
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ariadne2.o. If you want to compile it as
+	  The module will be called ariadne2. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config NE2K_ZORRO
@@ -314,7 +314,7 @@ config A2065
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you
-	  want). The module is called a2065.o. If you want to compile it as a
+	  want). The module is called a2065. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config HYDRA
@@ -325,7 +325,7 @@ config HYDRA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you
-	  want). The module is called hydra.o. If you want to compile it as a
+	  want). The module is called hydra. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config APNE
@@ -337,7 +337,7 @@ config APNE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you
-	  want). The module is called apne.o. If you want to compile it as a
+	  want). The module is called apne. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config APOLLO_ELPLUS
@@ -371,7 +371,7 @@ config MAC89x0
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  This module will
-	  be called mac89x0.o.
+	  be called mac89x0.
 
 config MACSONIC
 	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
@@ -387,7 +387,7 @@ config MACSONIC
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  This module will
-	  be called macsonic.o.
+	  be called macsonic.
 
 config MACMACE
 	bool "Macintosh (AV) onboard MACE ethernet (EXPERIMENTAL)"
@@ -537,7 +537,7 @@ config SUNLANCE
 	  cards are based on the AMD Lance chipset, which is better known
 	  via the NE2100 cards.
 
-	  This support is also available as a module called sunlance.o ( =
+	  This support is also available as a module called sunlance ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -551,7 +551,7 @@ config HAPPYMEAL
 	  both PCI and Sbus devices. This driver also supports the "qfe" quad
 	  100baseT device available in both PCI and Sbus configurations.
 
-	  This support is also available as a module called sunhme.o ( = code
+	  This support is also available as a module called sunhme ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -563,7 +563,7 @@ config SUNBMAC
 	  This driver supports the "be" interface available as an Sbus option.
 	  This is Sun's older 100baseT Ethernet device.
 
-	  This support is also available as a module called sunbmac.o ( = code
+	  This support is also available as a module called sunbmac ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -576,7 +576,7 @@ config SUNQE
 	  an Sbus option. Note that this is not the same as Quad FastEthernet
 	  "qfe" which is supported by the Happy Meal driver instead.
 
-	  This support is also available as a module called sunqe.o ( = code
+	  This support is also available as a module called sunqe ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -614,7 +614,7 @@ config EL1
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c501.o.  If you want to compile it as a
+	  The module will be called 3c501.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -628,7 +628,7 @@ config EL2
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c503.o.  If you want to compile it as a
+	  The module will be called 3c503.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -645,7 +645,7 @@ config ELPLUS
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called 3c505.o.
+	  called 3c505.
 
 config EL16
 	tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
@@ -657,7 +657,7 @@ config EL16
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c507.o.  If you want to compile it as a
+	  The module will be called 3c507.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -677,7 +677,7 @@ config EL3
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called 3c509.o.
+	  called 3c509.
 
 config 3C515
 	tristate "3c515 ISA \"Fast EtherLink\""
@@ -691,7 +691,7 @@ config 3C515
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called 3c515.o.
+	  called 3c515.
 
 config ELMC
 	tristate "3c523 \"EtherLink/MC\" support"
@@ -703,7 +703,7 @@ config ELMC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c523.o.  If you want to compile it as a
+	  The module will be called 3c523.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -717,7 +717,7 @@ config ELMC_II
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c527.o.  If you want to compile it as a
+	  The module will be called 3c527.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -757,7 +757,7 @@ config LANCE
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called lance.o.
+	  recommended.  The module will be called lance.
 
 config NET_VENDOR_SMC
 	bool "Western Digital/SMC cards"
@@ -782,7 +782,7 @@ config WD80x3
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called wd.o.  If you want to compile it as a
+	  The module will be called wd.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -796,7 +796,7 @@ config ULTRAMCA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smc-mca.o.  If you want to compile it as a
+	  The module will be called smc-mca.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -817,7 +817,7 @@ config ULTRA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smc-ultra.o.  If you want to compile it as
+	  The module will be called smc-ultra.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt> as
 	  well as <file:Documentation/networking/net-modules.txt>.
 
@@ -831,7 +831,7 @@ config ULTRA32
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smc-ultra32.o.  If you want to compile it
+	  The module will be called smc-ultra32.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt> as
 	  well as <file:Documentation/networking/net-modules.txt>.
 
@@ -848,7 +848,7 @@ config SMC9194
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smc9194.o.  If you want to compile it as a
+	  The module will be called smc9194.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -876,7 +876,7 @@ config NI5010
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ni5010.o.  If you want to compile it as a
+	  The module will be called ni5010.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -890,7 +890,7 @@ config NI52
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ni52.o.  If you want to compile it as a
+	  The module will be called ni52.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -904,7 +904,7 @@ config NI65
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ni65.o.  If you want to compile it as a
+	  The module will be called ni65.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -923,7 +923,7 @@ config AT1700
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called at1700.o.
+	  called at1700.
 
 config DEPCA
 	tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
@@ -939,7 +939,7 @@ config DEPCA
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
 	  called
-	  depca.o.
+	  depca.
 
 config HP100
 	tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
@@ -953,7 +953,7 @@ config HP100
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called hp100.o.
+	  called hp100.
 
 config NET_ISA
 	bool "Other ISA cards"
@@ -982,7 +982,7 @@ config E2100
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called e2100.o.  If you want to compile it as a
+	  The module will be called e2100.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1000,7 +1000,7 @@ config EWRK3
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called ewrk3.o.
+	  called ewrk3.
 
 config EEXPRESS
 	tristate "EtherExpress 16 support"
@@ -1017,7 +1017,7 @@ config EEXPRESS
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called eexpress.o.
+	  called eexpress.
 
 config EEXPRESS_PRO
 	tristate "EtherExpressPro support/EtherExpress 10 (i82595) support"
@@ -1031,7 +1031,7 @@ config EEXPRESS_PRO
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called eepro.o.  If you want to compile it as a
+	  The module will be called eepro.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1048,7 +1048,7 @@ config FMV18X
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called fmv18x.o.  If you want to compile it as a
+	  The module will be called fmv18x.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1062,7 +1062,7 @@ config HPLAN_PLUS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called hp-plus.o.  If you want to compile it as a
+	  The module will be called hp-plus.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1076,7 +1076,7 @@ config HPLAN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called hp.o.  If you want to compile it as a
+	  The module will be called hp.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1098,7 +1098,7 @@ config ETH16I
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called eth16i.o.  If you want to compile it as a
+	  The module will be called eth16i.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1119,7 +1119,7 @@ config NE2000
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ne.o.  If you want to compile it as a
+	  The module will be called ne.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1145,7 +1145,7 @@ config SEEQ8005
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called ewrk3.o.
+	  called ewrk3.
 
 config SK_G16
 	tristate "SK_G16 support (OBSOLETE)"
@@ -1168,7 +1168,7 @@ config SKMC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module is called sk_mca.o.  If you want to compile it as a
+	  The module is called sk_mca.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1182,7 +1182,7 @@ config NE2_MCA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ne2.o.  If you want to compile it as a
+	  The module will be called ne2.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1226,7 +1226,7 @@ config PCNET32
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pcnet32.o.  If you want to compile it as a
+	  The module will be called pcnet32.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1240,7 +1240,7 @@ config AMD8111_ETH
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called amd8111e.o.  If you want to compile it as a
+	  The module will be called amd8111e.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1256,7 +1256,7 @@ config ADAPTEC_STARFIRE
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called starfire.o.
+	  recommended.  The module will be called starfire.
 
 config AC3200
 	tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
@@ -1268,7 +1268,7 @@ config AC3200
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ac3200.o.  If you want to compile it as a
+	  The module will be called ac3200.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1284,7 +1284,7 @@ config APRICOT
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called apricot.o.
+	  called apricot.
 
 config B44
 	tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)"
@@ -1298,7 +1298,7 @@ config B44
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called b44.o.
+	  called b44.
 
 config CS89x0
 	tristate "CS89x0 support"
@@ -1314,7 +1314,7 @@ config CS89x0
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called cs89x.o.
+	  called cs89x.
 
 config DGRS
 	tristate "Digi Intl. RightSwitch SE-X support"
@@ -1329,7 +1329,7 @@ config DGRS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dgrs.o.  If you want to compile it as a
+	  The module will be called dgrs.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1343,7 +1343,7 @@ config EEPRO100
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called eepro100.o.  If you want to compile it as
+	  The module will be called eepro100.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt> as
 	  well as <file:Documentation/networking/net-modules.txt>.
 
@@ -1420,7 +1420,7 @@ config E100
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called e100.o.  If you want to compile it as a
+	  The module will be called e100.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1434,7 +1434,7 @@ config LNE390
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called lne390.o.  If you want to compile it as a
+	  The module will be called lne390.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1473,7 +1473,7 @@ config NE2K_PCI
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ne2k-pci.o.  If you want to compile it as
+	  The module will be called ne2k-pci.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt> as
 	  well as <file:Documentation/networking/net-modules.txt>.
 
@@ -1488,7 +1488,7 @@ config NE3210
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ne3210.o.  If you want to compile it as a
+	  The module will be called ne3210.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1502,7 +1502,7 @@ config ES3210
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called es3210.o.  If you want to compile it as a
+	  The module will be called es3210.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1518,7 +1518,7 @@ config 8139CP
 	  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 Documentation/modules.txt. This is recommended.
-	  The module will be called 8139cp.o.
+	  The module will be called 8139cp.
 
 config 8139TOO
 	tristate "RealTek RTL-8139 PCI Fast Ethernet Adapter support"
@@ -1533,7 +1533,7 @@ config 8139TOO
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called 8139too.o.
+	  recommended.  The module will be called 8139too.
 
 config 8139TOO_PIO
 	bool "Use PIO instead of MMIO"
@@ -1592,7 +1592,7 @@ config SIS900
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called sis900.o.
+	  recommended.  The module will be called sis900.
 
 config EPIC100
 	tristate "SMC EtherPower II"
@@ -1636,7 +1636,7 @@ config TLAN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tlan.o.  If you want to compile it as a
+	  The module will be called tlan.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1651,7 +1651,7 @@ config VIA_RHINE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called via-rhine.o.  If you want to compile it as
+	  The module will be called via-rhine.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt> as
 	  well as <file:Documentation/networking/net-modules.txt>.
 
@@ -1714,7 +1714,7 @@ config ATP
 	  If you want to compile this driver as a module however ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want), say M here and read
-	  <file:Documentation/modules.txt>.  The module will be called atp.o.
+	  <file:Documentation/modules.txt>.  The module will be called atp.
 
 config DE600
 	tristate "D-Link DE600 pocket adapter support"
@@ -1732,7 +1732,7 @@ config DE600
 	  which can be inserted in and removed from the running kernel
 	  whenever you want), say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called de600.o.
+	  The module will be called de600.
 
 config DE620
 	tristate "D-Link DE620 pocket adapter support"
@@ -1750,7 +1750,7 @@ config DE620
 	  which can be inserted in and removed from the running kernel
 	  whenever you want), say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called de620.o.
+	  The module will be called de620.
 
 config SGISEEQ
 	bool "SGI Seeq ethernet controller support"
@@ -1812,7 +1812,7 @@ config ACENIC
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called acenic.o.
+	  recommended.  The module will be called acenic.
 
 config ACENIC_OMIT_TIGON_I
 	bool "Omit support for old Tigon I based AceNICs"
@@ -1839,7 +1839,7 @@ config DL2K
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called dl2k.o.
+	  recommended.  The module will be called dl2k.
 
 config E1000
 	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
@@ -1881,7 +1881,7 @@ config E1000
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called e1000.o.  If you want to compile it as a
+	  The module will be called e1000.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -1898,7 +1898,7 @@ config MYRI_SBUS
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called myri_sbus.o.
+	  recommended.  The module will be called myri_sbus.
 
 config NS83820
 	tristate "National Semiconduct DP83820 support"
@@ -1922,7 +1922,7 @@ config HAMACHI
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called hamachi.o.
+	  called hamachi.
 
 config YELLOWFIN
 	tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
@@ -1937,7 +1937,7 @@ config YELLOWFIN
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called yellowfin.o.
+	  recommended.  The module will be called yellowfin.
 
 config R8169
 	tristate "Realtek 8169 gigabit ethernet support"
@@ -1948,7 +1948,7 @@ config R8169
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called r8169.o.
+	  recommended.  The module will be called r8169.
 
 config SK98LIN
 	tristate "SysKonnect SK-98xx support"
@@ -1976,7 +1976,7 @@ config SK98LIN
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called sk98lin.o.
+	  recommended.  The module will be called sk98lin.
 
 config TIGON3
 	tristate "Broadcom Tigon3 support"
@@ -1987,7 +1987,7 @@ config TIGON3
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called tg3.o.
+	  recommended.  The module will be called tg3.
 
 endmenu
 
@@ -2044,7 +2044,7 @@ config SKFP
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called skfp.o.
+	  recommended.  The module will be called skfp.
 
 config HIPPI
 	bool "HIPPI driver support (EXPERIMENTAL)"
@@ -2067,7 +2067,7 @@ config ROADRUNNER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called rrunner.o. If you want to compile it as a
+	  The module will be called rrunner. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -2116,7 +2116,7 @@ config PLIP
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called plip.o.  If unsure, say Y or M, in case you buy a laptop
+	  called plip.  If unsure, say Y or M, in case you buy a laptop
 	  later.
 
 config PPP
@@ -2148,7 +2148,7 @@ config PPP
 	  inserted in and removed from the running kernel whenever you want).
 	  If you said Y to "Version information on all symbols" above, then
 	  you cannot compile the PPP driver into the kernel; you can then only
-	  compile it as a module.  The module will be called ppp_generic.o.
+	  compile it as a module.  The module will be called ppp_generic.
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.
@@ -2239,7 +2239,7 @@ config PPP_BSDCOMP
 	  and is patent-free.
 
 	  Note that the BSD compression code will always be compiled as a
-	  module; it is called bsd_comp.o and will show up in the directory
+	  module; it is called bsd_comp and will show up in the directory
 	  modules once you have said "make modules". If unsure, say N.
 
 config PPPOE
@@ -2295,7 +2295,7 @@ config SLIP
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>. The module will be
-	  called slip.o.
+	  called slip.
 
 config SLIP_COMPRESSED
 	bool "CSLIP compressed headers"
@@ -2382,7 +2382,7 @@ config STRIP
 	  You can also compile this 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/modules.txt>.  The module will be
-	  called strip.o.
+	  called strip.
 
 config ARLAN
 	tristate "Aironet Arlan 655 & IC2200 DS support"
@@ -2412,7 +2412,7 @@ config AIRONET4500
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aironet4500_core.o. If you want to
+	  The module will be called aironet4500_core. If you want to
 	  compile it as a module, say M here and read
 	  <file:Documentation/modules.txt> as well as
 	  <file:Documentation/networking/net-modules.txt>.
@@ -2442,7 +2442,7 @@ config AIRONET4500_NONCS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aironet4500_card.o.  If you want to
+	  The module will be called aironet4500_card.  If you want to
 	  compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
 
@@ -2489,7 +2489,7 @@ config AIRONET4500_PROC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aironet4500_proc.o. If you want to
+	  The module will be called aironet4500_proc. If you want to
 	  compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
 
@@ -2525,7 +2525,7 @@ config IPHASE5526
 
 	  The driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called iph5526.o. For general information about
+	  The module will be called iph5526. For general information about
 	  modules read <file:Documentation/modules.txt>.
 
 config RCPCI
@@ -2535,7 +2535,7 @@ config RCPCI
 	  This is a driver for hardware which provides a Virtual Private
 	  Network (VPN). Say Y if you have it.
 
-	  This code is also available as a module called rcpci.o ( = code
+	  This code is also available as a module called rcpci ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -2560,7 +2560,7 @@ config SHAPER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called shaper.o.  If you want to compile it as a
+	  The module will be called shaper.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index 38cfc27494ae..b99acd69cc6c 100644
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -68,7 +68,7 @@ config IPDDP
 	  If you say M here, the AppleTalk-IP support will be compiled as a
 	  module ( = code which can be inserted in and removed from the
 	  running kernel whenever you want, read
-	  <file:Documentation/modules.txt>).  The module is called ipddp.o.
+	  <file:Documentation/modules.txt>).  The module is called ipddp.
 	  In this case, you will be able to use both encapsulation and
 	  decapsulation simultaneously, by loading two copies of the module
 	  and specifying different values for the module option ipddp_mode.
diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig
index 699cbd9630fd..d248ca9bc5a9 100644
--- a/drivers/net/arcnet/Kconfig
+++ b/drivers/net/arcnet/Kconfig
@@ -23,7 +23,7 @@ config ARCNET
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called arcnet.o.  If you want to compile it as a
+	  The module will be called arcnet.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -71,7 +71,7 @@ config ARCNET_COM90xx
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called com90xx.o.  If you want to compile it as a
+	  The module will be called com90xx.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -86,7 +86,7 @@ config ARCNET_COM90xxIO
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called com90io.o.  If you want to compile it as a
+	  The module will be called com90io.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -101,7 +101,7 @@ config ARCNET_RIM_I
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you
-	  want). The module will be called arc-rimi.o.  If you want to compile
+	  want). The module will be called arc-rimi.  If you want to compile
 	  it as a module, say M here and read <file:Documentation/modules.txt>
 	  as  well as <file:Documentation/networking/net-modules.txt>.
 
@@ -115,7 +115,7 @@ config ARCNET_COM20020
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called com20020.o.  If you want to compile it as
+	  The module will be called com20020.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt> as
 	  well as <file:Documentation/networking/net-modules.txt>.
 
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 8684da87f9ca..d1447c9ccafd 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -15,7 +15,7 @@ config MKISS
 	  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/modules.txt>.  The module
-	  will be called mkiss.o.
+	  will be called mkiss.
 
 config 6PACK
 	tristate "Serial port 6PACK driver"
@@ -35,7 +35,7 @@ config 6PACK
 	  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/modules.txt>.  The module
-	  will be called 6pack.o.
+	  will be called 6pack.
 
 config BPQETHER
 	tristate "BPQ Ethernet driver"
@@ -64,7 +64,7 @@ config DMASCC
 
 	  This driver can operate multiple boards simultaneously. If you
 	  compile it as a module (by saying M instead of Y), it will be called
-	  dmascc.o. If you don't pass any parameter to the driver, all
+	  dmascc. If you don't pass any parameter to the driver, all
 	  possible I/O addresses are probed. This could irritate other devices
 	  that are currently not in use. You may specify the list of addresses
 	  to be probed by "dmascc=addr1,addr2,..." (when compiled into the
@@ -94,7 +94,7 @@ config SCC
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called scc.o.
+	  will be called scc.
 
 config SCC_DELAY
 	bool "additional delay for PA0HZP OptoSCC compatible boards"
@@ -132,7 +132,7 @@ config BAYCOM_SER_FDX
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called baycom_ser_fdx.o.
+	  recommended.  The module will be called baycom_ser_fdx.
 
 config BAYCOM_SER_HDX
 	tristate "BAYCOM ser12 halfduplex driver for AX.25"
@@ -151,7 +151,7 @@ config BAYCOM_SER_HDX
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called baycom_ser_hdx.o.
+	  recommended.  The module will be called baycom_ser_hdx.
 
 config BAYCOM_PAR
 	tristate "BAYCOM picpar and par96 driver for AX.25"
@@ -167,7 +167,7 @@ config BAYCOM_PAR
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called baycom_par.o.
+	  recommended.  The module will be called baycom_par.
 
 config BAYCOM_EPP
 	tristate "BAYCOM epp driver for AX.25"
@@ -183,7 +183,7 @@ config BAYCOM_EPP
 	  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/modules.txt>.  This is
-	  recommended.  The module will be called baycom_par.o.
+	  recommended.  The module will be called baycom_par.
 
 config YAM
 	tristate "YAM driver for AX.25"
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 8fb899d0fac9..379a7f6b3b6a 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -9,7 +9,7 @@ config IRTTY_SIR
 	depends on IRDA
 	help
 	  Say Y here if you want to build support for the IrTTY line
-	  discipline.  If you want to compile it as a module (irtty-sir.o), say M
+	  discipline.  If you want to compile it as a module (irtty-sir), say M
 	  here and read <file:Documentation/modules.txt>.  IrTTY makes it
 	  possible to use Linux's own serial driver for all IrDA ports that
 	  are 16550 compatible.  Most IrDA chips are 16550 compatible so you
@@ -72,7 +72,7 @@ config IRTTY_OLD
 	depends on IRDA
 	help
 	  Say Y here if you want to build support for the IrTTY line
-	  discipline.  If you want to compile it as a module (irtty.o), say M
+	  discipline.  If you want to compile it as a module (irtty), say M
 	  here and read <file:Documentation/modules.txt>.  IrTTY makes it
 	  possible to use Linux's own serial driver for all IrDA ports that
 	  are 16550 compatible.  Most IrDA chips are 16550 compatible so you
@@ -86,7 +86,7 @@ config IRPORT_SIR
 	depends on IRDA
 	---help---
 	  Say Y here if you want to build support for the IrPORT IrDA device
-	  driver. If you want to compile it as a module (irport.o), say M here
+	  driver. If you want to compile it as a module (irport), say M here
 	  and read <file:Documentation/modules.txt>.  IrPORT can be used
 	  instead of IrTTY and sometimes this can be better.  One example is
 	  if your IrDA port does not have echo-canceling, which will work OK
@@ -188,7 +188,7 @@ config OLD_BELKIN_DONGLE
 	  Say Y here if you want to build support for the Adaptec Airport 1000
 	  and 2000 dongles.  If you want to compile it as a module, say M here
 	  and read <file:Documentation/modules.txt>.  The module will be
-	  called old_belkin.o.  Some information is contained in the comments
+	  called old_belkin.  Some information is contained in the comments
 	  at the top of <file:drivers/net/irda/old_belkin.c>.
 
 config EP7211_IR
@@ -230,7 +230,7 @@ config USB_IRDA
 	depends on IRDA && USB && EXPERIMENTAL
 	---help---
 	  Say Y here if you want to build support for the USB IrDA FIR Dongle
-	  device driver.  If you want to compile it as a module (irda-usb.o),
+	  device driver.  If you want to compile it as a module (irda-usb),
 	  say M here and read <file:Documentation/modules.txt>.  IrDA-USB
 	  support the various IrDA USB dongles available and most of their
 	  pecularities.  Those dongles plug in the USB port of your computer,
@@ -251,7 +251,7 @@ config NSC_FIR
 
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  nsc-ircc.o.
+	  nsc-ircc.
 
 config WINBOND_FIR
 	tristate "Winbond W83977AF (IR)"
@@ -264,7 +264,7 @@ config WINBOND_FIR
 
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  w83977af_ir.o.
+	  w83977af_ir.
 
 config TOSHIBA_OLD
 	tristate "Toshiba Type-O IR Port (old driver)"
@@ -276,7 +276,7 @@ config TOSHIBA_OLD
 	  maintained and will be removed in favor of the new driver.
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called toshoboe.o.
+	  The module will be called toshoboe.
 
 config TOSHIBA_FIR
 	tristate "Toshiba Type-O IR Port"
@@ -287,7 +287,7 @@ config TOSHIBA_FIR
 	  Libretto 100/110CT, Tecra 8100, Portege 7020 and many more laptops.
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
-	  The module will be called donauboe.o.
+	  The module will be called donauboe.
 
 config SMC_IRCC_FIR
 	tristate "SMC IrCC (EXPERIMENTAL)"
@@ -297,7 +297,7 @@ config SMC_IRCC_FIR
 	  Communications Controller.  It is used in the Fujitsu Lifebook 635t
 	  and Sony PCG-505TX.  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.  The module will be
-	  called smc-ircc.o.
+	  called smc-ircc.
 
 config ALI_FIR
 	tristate "ALi M5123 FIR (EXPERIMENTAL)"
@@ -310,7 +310,7 @@ config ALI_FIR
 
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  ali-ircc.o.
+	  ali-ircc.
 
 config VLSI_FIR
 	tristate "VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)"
@@ -322,7 +322,8 @@ config VLSI_FIR
 	  FIR (4Mbps) speeds.
 
 	  If you want to compile it as a module, say M here and read
-	  <file:Documentation/modules.txt>. The module will be called vlsi_ir.o.
+	  <file:Documentation/modules.txt>. The module will be called
+	  vlsi_ir.
 
 config SA1100_FIR
 	tristate "SA1100 Internal IR"
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index b78c55fe5b4a..0de8e557a624 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -30,7 +30,7 @@ config PCMCIA_3C589
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c589_cs.o.  If you want to compile it as
+	  The module will be called 3c589_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>. If
 	  unsure, say N.
 
@@ -43,7 +43,7 @@ config PCMCIA_3C574
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 3c574_cs.o.  If you want to compile it as
+	  The module will be called 3c574_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -56,7 +56,7 @@ config PCMCIA_FMVJ18X
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called fmvj18x_cs.o.  If you want to compile it
+	  The module will be called fmvj18x_cs.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
@@ -69,7 +69,7 @@ config PCMCIA_PCNET
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pcnet_cs.o.  If you want to compile it as
+	  The module will be called pcnet_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>. If
 	  unsure, say N.
 
@@ -82,7 +82,7 @@ config PCMCIA_NMCLAN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called nmclan_cs.o.  If you want to compile it as
+	  The module will be called nmclan_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -95,7 +95,7 @@ config PCMCIA_SMC91C92
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smc91c92_cs.o.  If you want to compile it
+	  The module will be called smc91c92_cs.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
@@ -108,7 +108,7 @@ config PCMCIA_XIRC2PS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called xirc2ps_cs.o.  If you want to compile it
+	  The module will be called xirc2ps_cs.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
@@ -123,7 +123,7 @@ config PCMCIA_AXNET
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called axnet_cs.o.  If you want to compile it as
+	  The module will be called axnet_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -136,7 +136,7 @@ config ARCNET_COM20020_CS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called com20020_cs.o.  If you want to compile it
+	  The module will be called com20020_cs.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
@@ -150,7 +150,7 @@ config PCMCIA_IBMTR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ibmtr_cs.o.  If you want to compile it as
+	  The module will be called ibmtr_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config NET_PCMCIA_RADIO
@@ -177,7 +177,7 @@ config PCMCIA_RAYCS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ray_cs.o.  If you want to compile it as a
+	  The module will be called ray_cs.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -191,7 +191,7 @@ config AIRONET4500_CS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aironet4500_cs.o. If you want to
+	  The module will be called aironet4500_cs. If you want to
 	  compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
 
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 06df8def7553..d9b3009a63fd 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -32,7 +32,7 @@ config IBMTR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ibmtr.o. If you want to compile it as a
+	  The module will be called ibmtr. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config IBMOL
@@ -48,7 +48,7 @@ config IBMOL
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called olympic.o. If you want to compile it
+	  The module will be called olympic. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 	  Also read <file:Documentation/networking/olympic.txt> or check the
@@ -66,7 +66,7 @@ config IBMLS
 
 	  This driver is also available as a modules ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The modules will be called lanstreamer.o. If you want to compile it
+	  The modules will be called lanstreamer. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config 3C359
@@ -82,7 +82,7 @@ config 3C359
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will will be called 3c359.o. If you want to compile it
+	  The module will will be called 3c359. If you want to compile it
 	  as a module, say M here and read Documentation/modules.txt.
 
 	  Also read the file <file:Documentation/networking/3c359.txt> or check the 
@@ -111,7 +111,7 @@ config TMS380TR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tms380tr.o. If you want to compile it
+	  The module will be called tms380tr. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config TMSPCI
@@ -128,7 +128,7 @@ config TMSPCI
 
 	  This driver is available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tmspci.o. If you want to compile it
+	  The module will be called tmspci. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config TMSISA
@@ -142,7 +142,7 @@ config TMSISA
 
 	  This driver is available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tmsisa.o. If you want to compile it
+	  The module will be called tmsisa. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config ABYSS
@@ -154,7 +154,7 @@ config ABYSS
 
 	  This driver is available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called abyss.o. If you want to compile it
+	  The module will be called abyss. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config MADGEMC
@@ -166,7 +166,7 @@ config MADGEMC
 
 	  This driver is available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called madgemc.o. If you want to compile it
+	  The module will be called madgemc. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config SMCTR
@@ -184,7 +184,7 @@ config SMCTR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called smctr.o. If you want to compile it
+	  The module will be called smctr. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 endmenu
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 774bce72bb87..9783fc99730f 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -27,7 +27,7 @@ config DE2104X
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tulip.o.  If you want to compile it as a
+	  The module will be called tulip.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -48,7 +48,7 @@ config TULIP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tulip.o.  If you want to compile it as a
+	  The module will be called tulip.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -86,7 +86,7 @@ config DE4X5
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called de4x5.o.  If you want to compile it as a
+	  The module will be called de4x5.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -110,7 +110,7 @@ config DM9102
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dmfe.o.  If you want to compile it as a
+	  The module will be called dmfe.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -125,7 +125,7 @@ config PCMCIA_XIRCOM
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called xircom_cb.o.  If you want to compile
+	  The module will be called xircom_cb.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>. If unsure, say N.
 
@@ -140,7 +140,7 @@ config PCMCIA_XIRTULIP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called xircom_tulip_cb.o.  If you want to compile
+	  The module will be called xircom_tulip_cb.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>. If unsure, say N.
 
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 4b347d6036c9..dded2729c36c 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -54,7 +54,7 @@ config COSA
 
 	  The driver will be compiled as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cosa.o. For general information about
+	  The module will be called cosa. For general information about
 	  modules read <file:Documentation/modules.txt>.
 
 #
@@ -76,7 +76,7 @@ config COMX
 	  use this driver.
 
 	  If you want to compile this as a module, say M and read
-	  <file:Documentation/modules.txt>.  The module will be called comx.o.
+	  <file:Documentation/modules.txt>.  The module will be called comx.
 
 config COMX_HW_COMX
 	tristate "Support for COMX/CMX/HiCOMX boards"
@@ -90,7 +90,7 @@ config COMX_HW_COMX
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  comx-hw-comx.o.
+	  comx-hw-comx.
 
 config COMX_HW_LOCOMX
 	tristate "Support for LoCOMX board"
@@ -101,7 +101,7 @@ config COMX_HW_LOCOMX
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  comx-hw-locomx.o.
+	  comx-hw-locomx.
 
 config COMX_HW_MIXCOM
 	tristate "Support for MixCOM board"
@@ -119,7 +119,7 @@ config COMX_HW_MIXCOM
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>. The module will be called
-	  comx-hw-mixcom.o.
+	  comx-hw-mixcom.
 
 config COMX_HW_MUNICH
 	tristate "Support for MUNICH based boards: SliceCOM, PCICOM (WelCOM)"
@@ -130,7 +130,7 @@ config COMX_HW_MUNICH
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called comx-hw-munich.o. If you want to compile it
+	  The module will be called comx-hw-munich. If you want to compile it
 	  as a module, say M here and read Documentation/modules.txt.
 
 	  Read linux/Documentation/networking/slicecom.txt for help on
@@ -147,7 +147,7 @@ config COMX_PROTO_PPP
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  comx-proto-ppp.o.
+	  comx-proto-ppp.
 
 config COMX_PROTO_LAPB
 	tristate "Support for LAPB protocol on MultiGate boards"
@@ -158,7 +158,7 @@ config COMX_PROTO_LAPB
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  comx-proto-lapb.o.
+	  comx-proto-lapb.
 
 config COMX_PROTO_FR
 	tristate "Support for Frame Relay on MultiGate boards"
@@ -169,7 +169,7 @@ config COMX_PROTO_FR
 
 	  If you want to compile this as a module, say M and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  comx-proto-fr.o.
+	  comx-proto-fr.
 
 #
 # The Etinc driver has not been tested as non-modular yet.
@@ -185,7 +185,7 @@ config DSCC4
 
 	  The driver will be compiled as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dscc4.o. For general information about
+	  The module will be called dscc4. For general information about
 	  modules read <file:Documentation/modules.txt>.
 
 #
@@ -214,7 +214,7 @@ config LANMEDIA
 	  To change setting such as syncPPP vs cisco HDLC or clock source you
 	  will need lmcctl.  It is available at <ftp://ftp.lanmedia.com/>.
 
-	  This code is also available as a module called lmc.o ( = code
+	  This code is also available as a module called lmc ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -229,7 +229,7 @@ config SEALEVEL_4021
 	  This driver can only be compiled as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to do that, say M here. The module will be called
-	  sealevel.o.
+	  sealevel.
 
 config SYNCLINK_SYNCPPP
 	tristate "SyncLink HDLC/SYNCPPP support"
@@ -317,7 +317,7 @@ config PC300
 	  If you want to compile this as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want),
 	  say M here and read Documentation/modules.txt. The module will be
-	  called pc300.o.
+	  called pc300.
 
 	  If you haven't heard about it, it's safe to say N.
 
@@ -369,7 +369,7 @@ config FARSYNC
 	  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/modules.txt>.
-	  The module will be called farsync.o and if you want the module to be
+	  The module will be called farsync and if you want the module to be
 	  automatically loaded when the interface is referenced then you
 	  should add "alias hdlcX farsync" to /etc/modules.conf for each
 	  interface, where X is 0, 1, 2, ...
@@ -408,7 +408,7 @@ config DLCI
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dlci.o. If you want to compile it as a
+	  The module will be called dlci. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config DLCI_COUNT
@@ -441,7 +441,7 @@ config SDLA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sdla.o. If you want to compile it as a
+	  The module will be called sdla. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 # Wan router core.
@@ -491,7 +491,7 @@ config VENDOR_SANGOMA
 
 	  The driver will be compiled as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called wanpipe.o.  For general information about
+	  The module will be called wanpipe.  For general information about
 	  modules read <file:Documentation/modules.txt>.
 
 config WANPIPE_CHDLC
@@ -583,7 +583,7 @@ config CYCLADES_SYNC
 
 	  The driver will be compiled as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cyclomx.o. For general information about
+	  The module will be called cyclomx. For general information about
 	  modules read <file:Documentation/modules.txt>.
 
 config CYCLOMX_X25
@@ -610,7 +610,7 @@ config LAPBETHER
 	  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/modules.txt>.  The module
-	  will be called lapbether.o.  If unsure, say N.
+	  will be called lapbether.  If unsure, say N.
 
 config X25_ASY
 	tristate "X.25 async driver (EXPERIMENTAL)"
@@ -625,7 +625,7 @@ config X25_ASY
 	  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/modules.txt>.  The module
-	  will be called x25_asy.o.  If unsure, say N.
+	  will be called x25_asy.  If unsure, say N.
 
 config SBNI
 	tristate "Granch SBNI12 Leased Line adapter support"
@@ -634,7 +634,7 @@ config SBNI
 	  This is a driver for ISA SBNI12-xx cards which are low cost
 	  alternatives to leased line modems. Say Y if you want to insert
 	  the driver into the kernel or say M to compile it as a module (the
-	  module will be called sbni.o).
+	  module will be called sbni).
 
 	  You can find more information and last versions of drivers and
 	  utilities at <http://www.granch.ru/>. If you have any question you
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 38667fa242e2..62aa29d77b8a 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -31,7 +31,7 @@ config WAVELAN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called wavelan.o.  If you want to compile it as a
+	  The module will be called wavelan.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> as well
 	  as <file:Documentation/networking/net-modules.txt>.
 
@@ -50,7 +50,7 @@ config AIRO
 	  and Cisco proprietary API, so both the Linux Wireless Tools and the
 	  Cisco Linux utilities can be used to configure the card.
 
-	  The driver can be compiled as a module and will be named "airo.o".
+	  The driver can be compiled as a module and will be named "airo".
 
 config HERMES
 	tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
@@ -121,7 +121,7 @@ config PCMCIA_NETWAVE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called netwave_cs.o.  If you want to compile it
+	  The module will be called netwave_cs.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
@@ -135,7 +135,7 @@ config PCMCIA_WAVELAN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called wavelan_cs.o.  If you want to compile it
+	  The module will be called wavelan_cs.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 9165c2345e35..46c62a31f9b0 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -28,7 +28,7 @@ config PARPORT
 	  ( = code which can be inserted in and removed from the running
 	  kernel whenever you want), say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  parport.o.  If you have more than one parallel port and want to
+	  parport.  If you have more than one parallel port and want to
 	  specify which port and IRQ to be used by this driver at module load
 	  time, take a look at <file:Documentation/parport.txt>.
 
@@ -47,7 +47,7 @@ config PARPORT_PC
 	  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/modules.txt>.  The module will be called
-	  parport_pc.o.
+	  parport_pc.
 
 	  If unsure, say Y.
 
@@ -63,7 +63,7 @@ config PARPORT_SERIAL
 	help
 	  This adds support for multi-IO PCI cards that have parallel and
 	  serial ports.  You should say Y or M here.  If you say M, the module
-	  will be called parport_serial.o.
+	  will be called parport_serial.
 
 config PARPORT_PC_FIFO
 	bool "Use FIFO/DMA if available (EXPERIMENTAL)"
@@ -103,7 +103,7 @@ config PARPORT_AMIGA
 	help
 	  Say Y here if you need support for the parallel port hardware on
 	  Amiga machines. This code is also available as a module (say M),
-	  called parport_amiga.o. If in doubt, saying N is the safe plan.
+	  called parport_amiga. If in doubt, saying N is the safe plan.
 
 config PARPORT_MFC3
 	tristate "Multiface III parallel port"
@@ -111,7 +111,7 @@ config PARPORT_MFC3
 	help
 	  Say Y here if you need parallel port support for the MFC3 card.
 	  This code is also available as a module (say M), called
-	  parport_mfc3.o. If in doubt, saying N is the safe plan.
+	  parport_mfc3. If in doubt, saying N is the safe plan.
 
 config PARPORT_ATARI
 	tristate "Atari hardware"
@@ -119,7 +119,7 @@ config PARPORT_ATARI
 	help
 	  Say Y here if you need support for the parallel port hardware on
 	  Atari machines. This code is also available as a module (say M),
-	  called parport_atari.o. If in doubt, saying N is the safe plan.
+	  called parport_atari. If in doubt, saying N is the safe plan.
 
 config PARPORT_GSC
 	tristate
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index dffef9c614e4..f6ea2466e1a8 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -25,8 +25,8 @@ config PCMCIA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  When compiled this way, there will be modules called pcmcia_core.o
-	  and ds.o.  If you want to compile it as a module, say M here and
+	  When compiled this way, there will be modules called pcmcia_core
+	  and ds.  If you want to compile it as a module, say M here and
 	  read <file:Documentation/modules.txt>.
 
 config CARDBUS
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 037e4cfc4055..eced050f2924 100644
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -56,7 +56,7 @@ config ISAPNP
 	  Say Y here if you would like support for ISA Plug and Play devices.
 	  Some information is in <file:Documentation/isapnp.txt>.
 
-	  This support is also available as a module called isapnp.o ( =
+	  This support is also available as a module called isapnp ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index 3fa911fe044c..f82b71dd057d 100644
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/Kconfig
@@ -48,7 +48,7 @@ config BLK_DEV_LOOP
 	  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/modules.txt>. The module
-	  will be called loop.o.
+	  will be called loop.
 
 	  Most users will answer N here.
 
@@ -77,7 +77,7 @@ config BLK_DEV_NBD
 	  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/modules.txt>. The module
-	  will be called nbd.o.
+	  will be called nbd.
 
 	  If unsure, say N.
 
@@ -97,7 +97,7 @@ config BLK_DEV_RAM
 	  If you want to compile this as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want),
 	  say M and read <file:Documentation/modules.txt>. The module will be
-	  called rd.o.
+	  called rd.
 
 	  Most normal users won't need the RAM disk functionality, and can
 	  thus say N here.
@@ -127,7 +127,7 @@ config BLK_DEV_XPRAM
 	  or zSeries as a disk.  This is useful as a _fast_ swap device if you
 	  want to access more than 2G of memory when running in 31 bit mode.
 	  This option is also available as a module which will be called
-	  xpram.o.  If unsure, say "N".
+	  xpram.  If unsure, say "N".
 
 comment "S/390 block device drivers"
 
@@ -286,7 +286,7 @@ config S390_TAPE
 	  least one of the tape interface options and one of the tape
 	  hardware options in order to access a tape device.
 	  This option is also available as a module. The module will be
-	  called tape390.o and include all selected interfaces and
+	  called tape390 and include all selected interfaces and
 	  hardware drivers.
 
 comment "S/390 tape interface support"
@@ -368,7 +368,7 @@ config DUMMY
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called dummy.o.  If you want to use more than one dummy
+	  will be called dummy.  If you want to use more than one dummy
 	  device at a time, you need to compile this driver as a module.
 	  Instead of 'dummy', the devices will then be called 'dummy0',
 	  'dummy1' etc.
@@ -393,7 +393,7 @@ config BONDING
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called bonding.o.
+	  will be called bonding.
 
 config EQUALIZER
 	tristate "EQL (serial line load balancing) support"
@@ -414,7 +414,7 @@ config EQUALIZER
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called eql.o.  If you want to compile it as a
+	  The module will be called eql.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.  If
 	  unsure, say N.
 
@@ -438,7 +438,7 @@ config TUN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tun.o.  If you want to compile it as a
+	  The module will be called tun.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 	  If you don't know what to use this for, you don't need it.
@@ -524,7 +524,7 @@ config LCS
   	   or zSeries. This device driver supports Token Ring (IEEE 802.5),
   	   FDDI (IEEE 802.7) and Ethernet. 
 	   This option is also available as a module which will be
-	   called lcs.o . If you do not know what it is, it's safe to say "Y".
+	   called lcs . If you do not know what it is, it's safe to say "Y".
 
 config CTC
 	tristate "CTC device support"
@@ -535,7 +535,7 @@ config CTC
 	  coupling using ESCON. It also supports virtual CTCs when running
 	  under VM. It will use the channel device configuration if this is
 	  available.  This option is also available as a module which will be
-	  called ctc.o.  If you do not know what it is, it's safe to say "Y".
+	  called ctc.  If you do not know what it is, it's safe to say "Y".
 
 config IUCV
 	tristate "IUCV device support (VM only)"
@@ -543,7 +543,7 @@ config IUCV
 	help
 	  Select this option if you want to use inter-user communication
 	  vehicle networking under VM or VIF.  This option is also available
-	  as a module which will be called iucv.o. If unsure, say "Y".
+	  as a module which will be called iucv. If unsure, say "Y".
 
 config CCWGROUP
  	tristate
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index d3a09f61f7c9..758b6fc576bc 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -13,7 +13,7 @@ config BLK_DEV_SD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sd_mod.o.  If you want to compile it as a
+	  The module will be called sd_mod.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> and
 	  <file:Documentation/scsi/scsi.txt>.  Do not compile this driver as a
 	  module if your root file system (the one containing the directory /)
@@ -32,7 +32,7 @@ config CHR_DEV_ST
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called st.o. If you want to compile it as a
+	  The module will be called st. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> and
 	  <file:Documentation/scsi/scsi.txt>.
 
@@ -57,7 +57,7 @@ config CHR_DEV_OSST
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called osst.o. If you want to compile it as a
+	  The module will be called osst. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> and
 	  <file:Documentation/scsi/scsi.txt>.
 
@@ -72,7 +72,7 @@ config BLK_DEV_SR
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sr_mod.o. If you want to compile it as a
+	  The module will be called sr_mod. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt> and
 	  <file:Documentation/scsi/scsi.txt>.
 
@@ -108,7 +108,7 @@ config CHR_DEV_SG
 	  If you want to compile this 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/modules.txt> and
-	  <file:Documentation/scsi/scsi.txt>. The module will be called sg.o.
+	  <file:Documentation/scsi/scsi.txt>. The module will be called sg.
 	  If unsure, say N.
 
 comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
@@ -214,7 +214,7 @@ config SCSI_7000FASST
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called wd7000.o.  If you want to compile it as a
+	  The module will be called wd7000.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_ACARD
@@ -225,7 +225,7 @@ config SCSI_ACARD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called atp870u.o. If you want to compile it as a
+	  The module will be called atp870u. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_AHA152X
@@ -242,7 +242,7 @@ config SCSI_AHA152X
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aha152x.o. If you want to compile it as a
+	  The module will be called aha152x. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_AHA1542
@@ -259,7 +259,7 @@ config SCSI_AHA1542
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called aha1542.o.
+	  will be called aha1542.
 
 config SCSI_AHA1740
 	tristate "Adaptec AHA1740 support"
@@ -273,7 +273,7 @@ config SCSI_AHA1740
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aha1740.o.  If you want to compile it as a
+	  The module will be called aha1740.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_AACRAID
@@ -321,7 +321,7 @@ config SCSI_AIC7XXX_OLD
 	  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/modules.txt>.  The module
-	  will be called aic7xxx_old.o.
+	  will be called aic7xxx_old.
 
 source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
 
@@ -338,7 +338,7 @@ config SCSI_DPT_I2O
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  dpt_i2o.o.
+	  dpt_i2o.
 
 config SCSI_ADVANSYS
 	tristate "AdvanSys SCSI support"
@@ -352,7 +352,7 @@ config SCSI_ADVANSYS
 	  inserted in and removed from the running kernel whenever you want).
 	  If you want to compile it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  advansys.o.
+	  advansys.
 
 config SCSI_IN2000
 	tristate "Always IN2000 SCSI support"
@@ -366,7 +366,7 @@ config SCSI_IN2000
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called in2000.o.
+	  will be called in2000.
 
 # does not use pci dma and seems to be isa/onboard only for old machines
 config SCSI_AM53C974
@@ -385,7 +385,7 @@ config SCSI_AM53C974
 	  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/modules.txt>.  The module
-	  will be called AM53C974.o.
+	  will be called AM53C974.
 
 config SCSI_MEGARAID
 	tristate "AMI MegaRAID support"
@@ -397,7 +397,7 @@ config SCSI_MEGARAID
 	  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/modules.txt>.  The module
-	  will be called megaraid.o.
+	  will be called megaraid.
 
 config SCSI_BUSLOGIC
 	tristate "BusLogic SCSI support"
@@ -415,7 +415,7 @@ config SCSI_BUSLOGIC
 	  inserted in and removed from the running kernel whenever you want),
 	  but only a single instance may be loaded. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
-	  The module will be called BusLogic.o.
+	  The module will be called BusLogic.
 
 config SCSI_OMIT_FLASHPOINT
 	bool "Omit FlashPoint support"
@@ -441,7 +441,7 @@ config SCSI_DMX3191D
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dmx3191d.o.  If you want to compile it as
+	  The module will be called dmx3191d.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_DTC3280
@@ -455,7 +455,7 @@ config SCSI_DTC3280
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dtc.o.  If you want to compile it as a
+	  The module will be called dtc.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_EATA
@@ -478,7 +478,7 @@ config SCSI_EATA
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called eata.o.
+	  will be called eata.
 
 config SCSI_EATA_TAGGED_QUEUE
 	bool "enable tagged command queueing"
@@ -527,7 +527,7 @@ config SCSI_EATA_DMA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called eata_dma.o.  If you want to compile it as
+	  The module will be called eata_dma.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_EATA_PIO
@@ -544,7 +544,7 @@ config SCSI_EATA_PIO
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called eata_pio.o.
+	  will be called eata_pio.
 
 config SCSI_FUTURE_DOMAIN
 	tristate "Future Domain 16xx SCSI/AHA-2920A support"
@@ -564,7 +564,7 @@ config SCSI_FUTURE_DOMAIN
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called fdomain.o. If you want to compile it as a
+	  The module will be called fdomain. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_FD_MCS
@@ -579,7 +579,7 @@ config SCSI_FD_MCS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called fd_mcs.o. If you want to compile it as a
+	  The module will be called fd_mcs. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_GDTH
@@ -616,7 +616,7 @@ config SCSI_GENERIC_NCR5380
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called g_NCR5380.o.  If you want to compile it as
+	  The module will be called g_NCR5380.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_GENERIC_NCR5380_MMIO
@@ -632,7 +632,7 @@ config SCSI_GENERIC_NCR5380_MMIO
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called g_NCR5380.o.  If you want to compile it as
+	  The module will be called g_NCR5380.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_GENERIC_NCR53C400
@@ -668,7 +668,7 @@ config SCSI_IBMMCA
 	  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/modules.txt>.  The module
-	  will be called ibmmca.o.
+	  will be called ibmmca.
 
 config IBMMCA_SCSI_ORDER_STANDARD
 	bool "Standard SCSI-order"
@@ -732,7 +732,7 @@ config SCSI_IPS
 	  inserted in and removed from the running kernel whenever you want),
 	  but only a single instance may be loaded. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
-	  The module will be called ips.o.
+	  The module will be called ips.
 
 config SCSI_INITIO
 	tristate "Initio 9100U(W) support"
@@ -745,7 +745,7 @@ config SCSI_INITIO
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called initio.o.
+	  will be called initio.
 
 config SCSI_INIA100
 	tristate "Initio INI-A100U2W support"
@@ -758,7 +758,7 @@ config SCSI_INIA100
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called a100u2w.o.
+	  will be called a100u2w.
 
 config SCSI_PPA
 	tristate "IOMEGA parallel port (ppa - older drives)"
@@ -787,7 +787,7 @@ config SCSI_PPA
 	  This driver is also available as a module which can be inserted in
 	  and removed from the running kernel whenever you want.  To compile
 	  this driver as a module, say M here and read
-	  <file:Documentation/modules.txt>.  The module will be called ppa.o.
+	  <file:Documentation/modules.txt>.  The module will be called ppa.
 
 config SCSI_IMM
 	tristate "IOMEGA parallel port (imm - newer drives)"
@@ -816,7 +816,7 @@ config SCSI_IMM
 	  This driver is also available as a module which can be inserted in
 	  and removed from the running kernel whenever you want.  To compile
 	  this driver as a module, say M here and read
-	  <file:Documentation/modules.txt>.  The module will be called imm.o.
+	  <file:Documentation/modules.txt>.  The module will be called imm.
 
 config SCSI_IZIP_EPP16
 	bool "ppa/imm option - Use slow (but safe) EPP-16"
@@ -859,7 +859,7 @@ config SCSI_NCR53C406A
 	  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/modules.txt>.  The module
-	  will be called NCR53c406.o.
+	  will be called NCR53c406.
 
 config SCSI_NCR_D700
 	tristate "NCR Dual 700 MCA SCSI support"
@@ -918,7 +918,7 @@ config SCSI_NCR53C7xx
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called 53c7,8xx.o.  If you want to compile it as
+	  The module will be called 53c7,8xx.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_NCR53C7xx_sync
@@ -1233,7 +1233,7 @@ config SCSI_MCA_53C9X
 	  If you want to compile this as a module (= code which can be
 	  inserted and removed from the running kernel whenever you want), say
 	  M here and read <file:Documentation/modules.txt>.  The module will
-	  be called mca_53c9x.o.
+	  be called mca_53c9x.
 
 config SCSI_PAS16
 	tristate "PAS16 SCSI support"
@@ -1247,7 +1247,7 @@ config SCSI_PAS16
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pas16.o.  If you want to compile it as a
+	  The module will be called pas16.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_PCI2000
@@ -1258,7 +1258,7 @@ config SCSI_PCI2000
 	  SCSI host adapter.  Please read the SCSI-HOWTO, available from
 	  <http://www.linuxdoc.org/docs.html#howto>.
 
-	  This driver is also available as a module called pci2000.o ( = code
+	  This driver is also available as a module called pci2000 ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want).  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -1271,7 +1271,7 @@ config SCSI_PCI2220I
 	  SCSI host adapter.  Please read the SCSI-HOWTO, available from
 	  <http://www.linuxdoc.org/docs.html#howto>.
 
-	  This driver is also available as a module called pci2220i.o ( = code
+	  This driver is also available as a module called pci2220i ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want).  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -1284,7 +1284,7 @@ config SCSI_PSI240I
 	  SCSI host adapter.  Please read the SCSI-HOWTO, available from
 	  <http://www.linuxdoc.org/docs.html#howto>.
 
-	  This driver is also available as a module called psi240i.o ( = code
+	  This driver is also available as a module called psi240i ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want).  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -1308,7 +1308,7 @@ config SCSI_QLOGIC_FAS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called qlogicfas.o. If you want to compile it as
+	  The module will be called qlogicfas. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_QLOGIC_ISP
@@ -1328,7 +1328,7 @@ config SCSI_QLOGIC_ISP
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called qlogicisp.o.  If you want to compile it as
+	  The module will be called qlogicisp.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_QLOGIC_FC
@@ -1339,7 +1339,7 @@ config SCSI_QLOGIC_FC
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called qlogicfc.o.  If you want to compile it as
+	  The module will be called qlogicfc.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_QLOGIC_FC_FIRMWARE
@@ -1358,7 +1358,7 @@ config SCSI_QLOGIC_1280
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called qla1280.o. If you want to compile it as
+	  The module will be called qla1280. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_SEAGATE
@@ -1373,7 +1373,7 @@ config SCSI_SEAGATE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called seagate.o.  If you want to compile it as a
+	  The module will be called seagate.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 # definitely looks note 64bit safe:
@@ -1409,7 +1409,7 @@ config SCSI_SYM53C416
 	  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/modules.txt>. The module will be called
-	  sym53c416.o.
+	  sym53c416.
 
 config SCSI_DC390T
 	tristate "Tekram DC390(T) and Am53/79C974 SCSI support"
@@ -1429,7 +1429,7 @@ config SCSI_DC390T
 	  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/modules.txt>.  The module
-	  will be called tmscsim.o.
+	  will be called tmscsim.
 
 config SCSI_DC390T_NOGENSUPP
 	bool "_omit_ support for non-DC390 adapters"
@@ -1462,7 +1462,7 @@ config SCSI_T128
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called t128.o.  If you want to compile it as a
+	  The module will be called t128.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_U14_34F
@@ -1481,7 +1481,7 @@ config SCSI_U14_34F
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called u14-34f.o.  If you want to compile it as a
+	  The module will be called u14-34f.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config SCSI_U14_34F_TAGGED_QUEUE
@@ -1533,7 +1533,7 @@ config SCSI_ULTRASTOR
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called ultrastor.o.
+	  will be called ultrastor.
 
 config SCSI_NSP32
 	tristate "Workbit NinjaSCSI-32Bi/UDE support"
@@ -1546,7 +1546,7 @@ config SCSI_NSP32
 	  If you want to compile this 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/modules.txt>.  The module
-	  will be called nsp32.o.
+	  will be called nsp32.
 
 config SCSI_DEBUG
 	tristate "SCSI debugging host simulator"
@@ -1568,7 +1568,7 @@ config SCSI_MESH
 	  Many Power Macintoshes and clones have a MESH (Macintosh Enhanced
 	  SCSI Hardware) SCSI bus adaptor (the 7200 doesn't, but all of the
 	  other Power Macintoshes do). Say Y to include support for this SCSI
-	  adaptor. This driver is also available as a module called mesh.o
+	  adaptor. This driver is also available as a module called mesh
 	  ( = code which can be inserted in and removed from the running
 	  kernel whenever you want). If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
@@ -1601,7 +1601,7 @@ config SCSI_MAC53C94
 	  machines which only have one SCSI bus, such as the 7200, also use
 	  the 53C94. Say Y to include support for the 53C94.
 
-	  This driver is also available as a module called mac53c94.o ( = code
+	  This driver is also available as a module called mac53c94 ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -1624,7 +1624,7 @@ config A3000_SCSI
 	  built-in SCSI controller, say Y. Otherwise, say N. This driver is
 	  also available as a module ( = code which can be inserted in and
 	  removed from the running kernel whenever you want). The module is
-	  called wd33c93.o. If you want to compile it as a module, say M here
+	  called wd33c93. If you want to compile it as a module, say M here
 	  and read <file:Documentation/modules.txt>.
 
 config A4000T_SCSI
@@ -1640,7 +1640,7 @@ config A2091_SCSI
 	  If you have a Commodore A2091 SCSI controller, say Y. Otherwise,
 	  say N. This driver is also available as a module ( = code which can
 	  be inserted in and removed from the running kernel whenever you
-	  want). The module is called wd33c93.o. If you want to compile it as
+	  want). The module is called wd33c93. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config GVP11_SCSI
@@ -1655,7 +1655,7 @@ config GVP11_SCSI
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you
-	  want). The module will be called gvp11.o. If you want to compile it
+	  want). The module will be called gvp11. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config CYBERSTORM_SCSI
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 869922fd34af..d30e280d50ce 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -13,7 +13,7 @@ config SCSI_AIC7XXX
 	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/modules.txt>.  The module
-	will be called aic7xxx.o.
+	will be called aic7xxx.
 
 config AIC7XXX_CMDS_PER_DEVICE
 	int "Maximum number of TCQ commands per device"
diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index 9129d617ecdd..da1060c62c0a 100644
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -23,7 +23,7 @@ config PCMCIA_AHA152X
 	  Say Y here if you intend to attach this type of PCMCIA SCSI host
 	  adapter to your computer.
 
-	  This driver is also available as a module called aha152x_cs.o ( =
+	  This driver is also available as a module called aha152x_cs ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -35,7 +35,7 @@ config PCMCIA_FDOMAIN
 	  Say Y here if you intend to attach this type of PCMCIA SCSI host
 	  adapter to your computer.
 
-	  This driver is also available as a module called fdomain_cs.o ( =
+	  This driver is also available as a module called fdomain_cs ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want).  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -48,7 +48,7 @@ config PCMCIA_NINJA_SCSI
 	  your computer, say Y here and read
 	  <file:Documentation/scsi/NinjaSCSI.txt>.
 
-	  This driver is also available as a module called nsp_cs.o ( =
+	  This driver is also available as a module called nsp_cs ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
@@ -60,7 +60,7 @@ config PCMCIA_QLOGIC
 	  Say Y here if you intend to attach this type of PCMCIA SCSI host
 	  adapter to your computer.
 
-	  This driver is also available as a module called qlogic_cs.o ( =
+	  This driver is also available as a module called qlogic_cs ( =
 	  code which can be inserted in and removed from the running kernel
 	  whenever you want).  If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7a9a69aa3619..13c1afd68244 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -23,7 +23,7 @@ config SERIAL_8250
 
 	  If you want to compile this driver as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  serial.o.
+	  serial.
 	  [WARNING: Do not compile this driver as a module if you are using
 	  non-standard serial ports, since the configuration information will
 	  be lost when the driver is unloaded.  This limitation may be lifted
@@ -73,7 +73,7 @@ config SERIAL_8250_CS
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called serial_cs.o.  If you want to compile it as
+	  The module will be called serial_cs.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig
index be4fde7bdb29..c51a4a09bfbf 100644
--- a/drivers/telephony/Kconfig
+++ b/drivers/telephony/Kconfig
@@ -16,7 +16,7 @@ config PHONE
 	  This support is also available as a module.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.  The module will be called
-	  phonedev.o.
+	  phonedev.
 
 config PHONE_IXJ
 	tristate "QuickNet Internet LineJack/PhoneJack support"
@@ -25,7 +25,7 @@ config PHONE_IXJ
 	  Say M if you have a telephony card manufactured by Quicknet
 	  Technologies, Inc.  These include the Internet PhoneJACK and
 	  Internet LineJACK Telephony Cards. You will get a module called
-	  ixj.o.
+	  ixj.
 
 	  For the ISA versions of these products, you can configure the
 	  cards using the isapnp tools (pnpdump/isapnp) or you can use the
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 139e1f000812..6024f359cb63 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -35,7 +35,7 @@ config USB
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usbcore.o.  If you want to compile it as a
+	  The module will be called usbcore.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 source "drivers/usb/core/Kconfig"
@@ -84,7 +84,7 @@ config USB_USS720
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called uss720.o. If you want to compile it as a
+	  The module will be called uss720. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 source "drivers/usb/serial/Kconfig"
diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 8d42c0978ca4..803692325bab 100644
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -13,7 +13,7 @@ config USB_AUDIO
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called audio.o. If you want to compile it as a
+	  The module will be called audio. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 comment "USB Bluetooth TTY can only be used with disabled Bluetooth subsystem"
@@ -38,7 +38,7 @@ config USB_BLUETOOTH_TTY
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called bluetty.o. If you want to compile it as
+	  The module will be called bluetty. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_MIDI
@@ -61,7 +61,7 @@ config USB_MIDI
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usb-midi.o. If you want to compile it as a
+	  The module will be called usb-midi. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_ACM
@@ -78,7 +78,7 @@ config USB_ACM
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called acm.o. If you want to compile it as a
+	  The module will be called acm. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_PRINTER
@@ -90,6 +90,6 @@ config USB_PRINTER
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called printer.o. If you want to compile it as a
+	  The module will be called printer. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 9bad44cc02e4..7439fadfd652 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -28,7 +28,7 @@ config USB_EHCI_HCD
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ehci-hcd.o. If you want to compile it as a
+	  The module will be called ehci-hcd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_OHCI_HCD
@@ -46,7 +46,7 @@ config USB_OHCI_HCD
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ohci-hcd.o. If you want to compile it
+	  The module will be called ohci-hcd. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_UHCI_HCD
@@ -64,7 +64,7 @@ config USB_UHCI_HCD
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called uhci-hcd.o. If you want to compile it as a
+	  The module will be called uhci-hcd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SL811HS
@@ -77,6 +77,6 @@ config USB_SL811HS
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called hc_sl811.o. If you want to compile it
+	  The module will be called hc_sl811. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig
index 860e5c6b53b7..4effa35921e8 100644
--- a/drivers/usb/image/Kconfig
+++ b/drivers/usb/image/Kconfig
@@ -16,7 +16,7 @@ config USB_MDC800
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mdc800.o. If you want to compile it as a
+	  The module will be called mdc800. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SCANNER
@@ -29,7 +29,7 @@ config USB_SCANNER
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called scanner.o. If you want to compile it as
+	  The module will be called scanner. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_MICROTEK
@@ -42,7 +42,7 @@ config USB_MICROTEK
 	  Please report failures and successes.
 	  The scanner will appear as a scsi generic device to the rest
 	  of the system. Scsi support is required.
-	  This driver can be compiled as a module, called microtek.o.
+	  This driver can be compiled as a module, called microtek.
 
 config USB_HPUSBSCSI
 	tristate "HP53xx USB scanner support (EXPERIMENTAL)"
@@ -51,5 +51,5 @@ config USB_HPUSBSCSI
 	  Say Y here if you want support for the HP 53xx series of scanners
 	  and the Minolta Scan Dual. This driver is experimental.
 	  The scanner will be accessible as a SCSI device.
-	  This can be compiled as a module, called hpusbscsi.o.
+	  This can be compiled as a module, called hpusbscsi.
 
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index d98850e91055..6d6c429d7ecd 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -22,7 +22,7 @@ config USB_HID
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called hid.o. If you want to compile it as a
+	  The module will be called hid. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 comment "Input core support is needed for USB HID input layer or HIDBP support"
@@ -98,7 +98,7 @@ config USB_KBD
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usbkbd.o. If you want to compile it as a
+	  The module will be called usbkbd. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 	  If even remotely unsure, say N.
@@ -116,7 +116,7 @@ config USB_MOUSE
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usbmouse.o. If you want to compile it as
+	  The module will be called usbmouse. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 	  If even remotely unsure, say N.
@@ -134,7 +134,7 @@ config USB_AIPTEK
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called aiptek.o. If you want to compile it as a
+	  The module will be called aiptek. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_WACOM
@@ -148,7 +148,7 @@ config USB_WACOM
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called wacom.o.  If you want to compile it as a
+	  The module will be called wacom.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_POWERMATE
@@ -165,7 +165,7 @@ config USB_POWERMATE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called powermate.o. If you want to compile it as a
+	  The module will be called powermate. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_XPAD
@@ -181,6 +181,6 @@ config USB_XPAD
 
 	  This driver is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called xpad.o.  If you want to compile it as a
+	  The module will be called xpad.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
index a179a8649c63..681e1b35c391 100644
--- a/drivers/usb/media/Kconfig
+++ b/drivers/usb/media/Kconfig
@@ -16,7 +16,7 @@ config USB_DABUSB
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dabusb.o.  If you want to compile it as a
+	  The module will be called dabusb.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 comment "Video4Linux support is needed for USB Multimedia device support"
@@ -35,7 +35,7 @@ config USB_VICAM
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called vicam.o. If you want to compile it as a
+	  The module will be called vicam. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_DSBR
@@ -55,7 +55,7 @@ config USB_DSBR
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called dsbr100.o. If you want to compile it as a
+	  The module will be called dsbr100. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_IBMCAM
@@ -74,7 +74,7 @@ config USB_IBMCAM
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ibmcam.o.  If you want to compile it as a
+	  The module will be called ibmcam.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>. This
 	  camera has several configuration options which can be specified when
 	  you load the module.  Read <file:Documentation/usb/ibmcam.txt> to
@@ -95,7 +95,7 @@ config USB_KONICAWC
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called konicawc.o. If you want to compile it as
+	  The module will be called konicawc. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_OV511
@@ -113,7 +113,7 @@ config USB_OV511
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ov511.o. If you want to compile it as a
+	  The module will be called ov511. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_PWC
@@ -154,7 +154,7 @@ config USB_PWC
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pwc.o.  If you want to compile it as a
+	  The module will be called pwc.  If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SE401
@@ -172,7 +172,7 @@ config USB_SE401
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called se401.o. If you want to compile it as a
+	  The module will be called se401. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_STV680
@@ -191,6 +191,6 @@ config USB_STV680
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called stv680.o. If you want to compile it as a
+	  The module will be called stv680. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 15c4fa06f264..200f9a4c5c65 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -16,7 +16,7 @@ config USB_EMI26
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called audio.o. If you want to compile it as a
+	  The module will be called audio. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_TIGL
@@ -32,7 +32,7 @@ config USB_TIGL
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called tiglusb.o. If you want to compile it as a
+	  The module will be called tiglusb. If you want to compile it as a
 	  module, say M here and read Documentation/modules.txt.
 
 	  If you don't know what the SilverLink cable is or what a Texas
@@ -50,7 +50,7 @@ config USB_AUERSWALD
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called auerswald.o. If you want to compile it as
+	  The module will be called auerswald. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_RIO500
@@ -63,7 +63,7 @@ config USB_RIO500
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called rio500.o. If you want to compile it as
+	  The module will be called rio500. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_BRLVGER
@@ -76,7 +76,7 @@ config USB_BRLVGER
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called brlvger.o. If you want to compile it as
+	  The module will be called brlvger. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_LCD
@@ -90,7 +90,7 @@ config USB_LCD
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usblcd.o. If you want to compile it as
+	  The module will be called usblcd. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SPEEDTOUCH
diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index 9bc58cce2016..815212e0369a 100644
--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
@@ -25,7 +25,7 @@ config USB_CATC
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called catc.o. If you want to compile it as a
+	  The module will be called catc. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_CDCETHER
@@ -49,7 +49,7 @@ config USB_CDCETHER
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cdc-ether.o.  If you want to compile it 
+	  The module will be called cdc-ether.  If you want to compile it 
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_KAWETH
@@ -91,7 +91,7 @@ config USB_KAWETH
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called kaweth.o. If you want to compile it as a
+	  The module will be called kaweth. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_PEGASUS
@@ -107,7 +107,7 @@ config USB_PEGASUS
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pegasus.o. If you want to compile it as a
+	  The module will be called pegasus. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_RTL8150
@@ -120,7 +120,7 @@ config USB_RTL8150
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called rtl8150.o. If you want to compile it as a
+	  The module will be called rtl8150. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_USBNET
@@ -144,6 +144,6 @@ config USB_USBNET
 
 	  This code is also available as a kernel module (code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usbnet.o. If you want to compile it as a
+	  The module will be called usbnet. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 82f3db1ee634..55717383b997 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -19,7 +19,7 @@ config USB_SERIAL
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usbserial.o. If you want to compile it
+	  The module will be called usbserial. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_DEBUG
@@ -72,7 +72,7 @@ config USB_SERIAL_BELKIN
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called belkin_sa.o.  If you want to compile it as
+	  The module will be called belkin_sa.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_WHITEHEAT
@@ -84,7 +84,7 @@ config USB_SERIAL_WHITEHEAT
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called whiteheat.o.  If you want to compile it as
+	  The module will be called whiteheat.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_DIGI_ACCELEPORT
@@ -101,7 +101,7 @@ config USB_SERIAL_DIGI_ACCELEPORT
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called digi_acceleport.o.  If you want to compile
+	  The module will be called digi_acceleport.  If you want to compile
 	  it as a module, say M here and read
 	  <file:Documentation/modules.txt>.
 
@@ -116,7 +116,7 @@ config USB_SERIAL_EMPEG
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called empeg.o. If you want to compile it as a
+	  The module will be called empeg. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_FTDI_SIO
@@ -132,7 +132,7 @@ config USB_SERIAL_FTDI_SIO
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ftdi_sio.o.  If you want to compile it as
+	  The module will be called ftdi_sio.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_VISOR
@@ -146,7 +146,7 @@ config USB_SERIAL_VISOR
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called visor.o. If you want to compile it as a
+	  The module will be called visor. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_IPAQ
@@ -160,7 +160,7 @@ config USB_SERIAL_IPAQ
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ipaq.o. If you want to compile it as a
+	  The module will be called ipaq. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_IR
@@ -173,7 +173,7 @@ config USB_SERIAL_IR
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called ir-usb.o. If you want to compile it as a
+	  The module will be called ir-usb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_EDGEPORT
@@ -201,7 +201,7 @@ config USB_SERIAL_EDGEPORT
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called io_edgeport.o.  If you want to compile it
+	  The module will be called io_edgeport.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_EDGEPORT_TI
@@ -214,7 +214,7 @@ config USB_SERIAL_EDGEPORT_TI
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called io_ti.o.  If you want to compile it
+	  The module will be called io_ti.  If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_KEYSPAN_PDA
@@ -227,7 +227,7 @@ config USB_SERIAL_KEYSPAN_PDA
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called keyspan_pda.o. If you want to compile it
+	  The module will be called keyspan_pda. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_KEYSPAN
@@ -243,7 +243,7 @@ config USB_SERIAL_KEYSPAN
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called keyspan.o. If you want to compile it as a
+	  The module will be called keyspan. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_KEYSPAN_USA28
@@ -323,7 +323,7 @@ config USB_SERIAL_KLSI
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called kl5kusb105.o. If you want to compile it as
+	  The module will be called kl5kusb105. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_KOBIL_SCT
@@ -342,7 +342,7 @@ config USB_SERIAL_KOBIL_SCT
           Note that you need a current CT-API.
           This code is also available as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want).
-          The module will be called kobil_sct.o. If you want to compile it as
+          The module will be called kobil_sct. If you want to compile it as
           a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_MCT_U232
@@ -357,7 +357,7 @@ config USB_SERIAL_MCT_U232
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called mct_u232.o.  If you want to compile it as
+	  The module will be called mct_u232.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_PL2303
@@ -369,7 +369,7 @@ config USB_SERIAL_PL2303
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called pl2303.o.  If you want to compile it as
+	  The module will be called pl2303.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_SAFE
@@ -390,7 +390,7 @@ config USB_SERIAL_CYBERJACK
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called cyberjack.o. If you want to compile it as
+	  The module will be called cyberjack. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.
@@ -405,7 +405,7 @@ config USB_SERIAL_XIRCOM
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called keyspan_pda.o. If you want to compile it
+	  The module will be called keyspan_pda. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_SERIAL_OMNINET
@@ -416,7 +416,7 @@ config USB_SERIAL_OMNINET
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called omninet.o. If you want to compile it as a
+	  The module will be called omninet. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_EZUSB
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 381fb6f8c1c7..c2a8d5c4574c 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -16,7 +16,7 @@ config USB_STORAGE
 
 	  This code is also available as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called usb-storage.o. If you want to compile it
+	  The module will be called usb-storage. If you want to compile it
 	  as a module, say M here and read <file:Documentation/modules.txt>.
 
 config USB_STORAGE_DEBUG
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a85cb2faf151..5f440dd79e97 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -160,7 +160,7 @@ config FB_AMIGA
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called amifb.o. If you want to compile it as a
+	  module will be called amifb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config FB_AMIGA_OCS
@@ -292,7 +292,7 @@ config FB_VGA16
 	  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/modules.txt>.  The module will be called
-	  vga16fb.o.
+	  vga16fb.
 
 config FB_STI
 	tristate "HP STI frame buffer device support"
@@ -350,7 +350,7 @@ config FB_HGA
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want).
-	  The module will be called hgafb.o. If you want to compile it as
+	  The module will be called hgafb. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 	  As this card technology is 15 years old, most people will answer N
@@ -406,7 +406,7 @@ config FB_PVR2
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want).
-	  The module will be called pvr2fb.o.  If you want to compile it as
+	  The module will be called pvr2fb.  If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 	  You can pass several parameters to the driver at boot time or at
@@ -462,7 +462,7 @@ config FB_RIVA
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called rivafb.o. If you want to compile it as a
+	  module will be called rivafb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config FB_I810
@@ -474,7 +474,7 @@ config FB_I810
 
           The driver is also available as a module ( = code which can be
           inserted and removed from the running kernel whenever you want). 
-          The module will be called i810fb.o. If you want to compile it as a
+          The module will be called i810fb. If you want to compile it as a
           module, say M here and read <file:Documentation/modules.txt>.
 
           For more information, please read 
@@ -514,7 +514,7 @@ config FB_MATROX
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want).
-	  The module will be called matroxfb.o. If you want to compile it as
+	  The module will be called matroxfb. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 	  You can pass several parameters to the driver at boot time or at
@@ -606,7 +606,7 @@ config FB_MATROX_I2C
 	  second head of G400 or MGA-TVO on G200 or G400.
 
 	  If you compile it as module, it will create a module named
-	  i2c-matroxfb.o.
+	  i2c-matroxfb.
 
 config FB_MATROX_MAVEN
 	tristate "G400 second head support"
@@ -622,7 +622,7 @@ config FB_MATROX_MAVEN
 	  the fbdev driver on first head and the fbdev driver on second head.
 
 	  If you compile it as module, two modules are created,
-	  matroxfb_crtc2.o and matroxfb_maven.o. Matroxfb_maven is needed for
+	  matroxfb_crtc2 and matroxfb_maven. Matroxfb_maven is needed for
 	  both G200 and G400, matroxfb_crtc2 is needed only by G400. You must
 	  also load i2c-matroxfb to get it to run.
 
@@ -651,7 +651,7 @@ config FB_MATROX_MULTIHEAD
 
 	  If you said M to "Matrox unified accelerated driver" and N here, you
 	  will still be able to use several Matrox devices simultaneously:
-	  insert several instances of the module matroxfb.o into the kernel
+	  insert several instances of the module matroxfb into the kernel
 	  with insmod, supplying the parameter "dev=N" where N is 0, 1, etc.
 	  for the different Matrox devices. This method is slightly faster but
 	  uses 40 KB of kernel memory per Matrox card.
@@ -679,7 +679,7 @@ config FB_ATY128
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called aty128fb.o. If you want to compile it as a
+	  module will be called aty128fb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config FB_ATY
@@ -691,7 +691,7 @@ config FB_ATY
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called atyfb.o. If you want to compile it as a
+	  module will be called atyfb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config FB_ATY_CT
@@ -746,7 +746,7 @@ config FB_NEOMAGIC
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called neofb.o. If you want to compile it as a
+	  module will be called neofb. If you want to compile it as a
 	  module, say M here and read Documentation/modules.txt.
 
 config FB_3DFX
@@ -758,7 +758,7 @@ config FB_3DFX
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called tdfxfb.o. If you want to compile it as a
+	  module will be called tdfxfb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config FB_VOODOO1
@@ -770,7 +770,7 @@ config FB_VOODOO1
 
 	  This driver is also available as a module ( = code which can be 
 	  inserted and removed from the running kernel whenever you want).
-	  The module will be called sstfb.o. If you want to compile it as
+	  The module will be called sstfb. If you want to compile it as
 	  a module, say M here and read Documentation/modules.txt.
 
 	  WARNING: Do not use any application that uses the 3D engine
@@ -791,7 +791,7 @@ config FB_TRIDENT
 
 	  The driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called tridentfb.o. If you want to compile it as a
+	  module will be called tridentfb. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
 config FB_PM3
@@ -917,7 +917,7 @@ config FB_VIRTUAL
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called vfb.o. If you want to compile it as a module,
+	  module will be called vfb. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index e7533c91f0f4..a2b448ecbd7c 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -52,7 +52,7 @@ config MDA_CONSOLE
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want).
-	  The module will be called mdacon.o. If you want to compile it as
+	  The module will be called mdacon. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.
@@ -131,7 +131,7 @@ config FBCON_ADVANCED
 
 	  Low level frame buffer console drivers can be modules ( = code which
 	  can be inserted and removed from the running kernel whenever you
-	  want). The modules will be called fbcon-*.o. If you want to compile
+	  want). The modules will be called fbcon-*. If you want to compile
 	  (some of) them as modules, read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.