[PATCH] Kconfig fixes for modules.txt

Kconfig cleanup megapatch from Nicolas Kaiser <nikai@nikai.net>.

modules.txt no longer exists, and the common wording used to refer to
it sucks.  This is all by Nicolas Kaiser's: at Randy and Matthew's
request, "say M" changed to "choose M" (more sense for graphical front
ends, too).

9 files changed, 126 insertions, 252 deletions

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 00c767e430fe..96fb7dc031c3 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -19,10 +19,8 @@ config INPUT
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called input.
 
 comment "Userland interfaces"
 
@@ -39,10 +37,8 @@ config INPUT_MOUSEDEV
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called mousedev.
 
 config INPUT_MOUSEDEV_PSAUX
 	bool "Provide legacy /dev/psaux device" if EMBEDDED
@@ -80,10 +76,8 @@ config INPUT_JOYDEV
 
 	  More information is available: <file:Documentation/input/joystick.txt>
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called joydev.
 
 config INPUT_TSDEV
 	tristate "Touchscreen interface"
@@ -95,10 +89,8 @@ config INPUT_TSDEV
 
 	  If unsure, 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 tsdev. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called tsdev.
 
 config INPUT_TSDEV_SCREEN_X
 	int "Horizontal screen resolution"
@@ -117,10 +109,8 @@ config INPUT_EVDEV
 	  Say Y here if you want your input device events be accessible
 	  under char device 13:64+ - /dev/input/eventX in a generic way.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called evdev.
 
 config INPUT_EVBUG
 	tristate "Event debugging"
@@ -134,10 +124,8 @@ config INPUT_EVBUG
 
 	  If unsure, 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 joydev. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called evbug.
 
 comment "Input I/O drivers"
 
diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig
index d7beafd0a43f..708aa123b68a 100644
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
@@ -16,10 +16,8 @@ config GAMEPORT
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called gameport.
 
 config SOUND_GAMEPORT
 	tristate
@@ -34,10 +32,8 @@ config GAMEPORT_NS558
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called ns558.
 
 config GAMEPORT_L4
 	tristate "PDPI Lightning 4 gamecard support"
@@ -45,10 +41,8 @@ config GAMEPORT_L4
 	help
 	  Say Y here if you have a PDPI Lightning 4 gamecard.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called lightning.
 
 config GAMEPORT_EMU10K1
 	tristate "SB Live and Audigy gameport support"
@@ -57,10 +51,8 @@ config GAMEPORT_EMU10K1
 	  Say Y here if you have a SoundBlaster Live! or SoundBlaster
 	  Audigy card and want to use its 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 emu10k1-gp. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called emu10k1-gp.
 
 config GAMEPORT_VORTEX
 	tristate "Aureal Vortex, Vortex 2 gameport support"
@@ -69,10 +61,8 @@ config GAMEPORT_VORTEX
 	  Say Y here if you have an Aureal Vortex 1 or 2  card and want
 	  to use its 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 vortex. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called vortex.
 
 config GAMEPORT_FM801
 	tristate "ForteMedia FM801 gameport support"
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 8c3561a26068..ca7e93dcd47a 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -27,10 +27,8 @@ config JOYSTICK_ANALOG
 	  Please read the file <file:Documentation/input/joystick.txt> which
 	  contains more information.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called analog.
 
 config JOYSTICK_A3D
 	tristate "Assasin 3D and MadCatz Panther devices"
@@ -39,10 +37,8 @@ config JOYSTICK_A3D
 	  Say Y here if you have an FPGaming or MadCatz controller using the
 	  A3D protocol over the PC 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 a3d. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called a3d.
 
 config JOYSTICK_ADI
 	tristate "Logitech ADI digital joysticks and gamepads"
@@ -51,10 +47,8 @@ config JOYSTICK_ADI
 	  Say Y here if you have a Logitech controller using the ADI
 	  protocol over the PC 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 adi. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called adi.
 
 config JOYSTICK_COBRA
 	tristate "Creative Labs Blaster Cobra gamepad"
@@ -62,10 +56,8 @@ config JOYSTICK_COBRA
 	help
 	  Say Y here if you have a Creative Labs Blaster Cobra gamepad.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called cobra.
 
 config JOYSTICK_GF2K
 	tristate "Genius Flight2000 Digital joysticks and gamepads"
@@ -74,10 +66,8 @@ config JOYSTICK_GF2K
 	  Say Y here if you have a Genius Flight2000 or MaxFighter digitally
 	  communicating joystick or gamepad.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called gf2k.
 
 config JOYSTICK_GRIP
 	tristate "Gravis GrIP joysticks and gamepads"
@@ -86,10 +76,8 @@ config JOYSTICK_GRIP
 	  Say Y here if you have a Gravis controller using the GrIP protocol
 	  over the PC 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 grip. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called grip.
 
 config JOYSTICK_GRIP_MP
 	tristate "Gravis GrIP MultiPort"
@@ -98,10 +86,8 @@ config JOYSTICK_GRIP_MP
 	  Say Y here if you have the original Gravis GrIP MultiPort, a hub
 	  that connects to the gameport and you connect gamepads to it.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called grip_mp.
 
 config JOYSTICK_GUILLEMOT
 	tristate "Guillemot joysticks and gamepads"
@@ -110,10 +96,8 @@ config JOYSTICK_GUILLEMOT
 	  Say Y here if you have a Guillemot joystick using a digital
 	  protocol over the PC 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 guillemot. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called guillemot.
 
 config JOYSTICK_INTERACT
 	tristate "InterAct digital joysticks and gamepads"
@@ -122,10 +106,8 @@ config JOYSTICK_INTERACT
 	  Say Y here if you have an InterAct gameport or joystick
 	  communicating digitally over the 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 interact. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called interact.
 
 config JOYSTICK_SIDEWINDER
 	tristate "Microsoft SideWinder digital joysticks and gamepads"
@@ -134,10 +116,8 @@ config JOYSTICK_SIDEWINDER
 	  Say Y here if you have a Microsoft controller using the Digital
 	  Overdrive protocol over PC 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 sidewinder. If you want to compile it
-	  as a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called sidewinder.
 
 config JOYSTICK_TMDC
 	tristate "ThrustMaster DirectConnect joysticks and gamepads"
@@ -146,10 +126,8 @@ config JOYSTICK_TMDC
 	  Say Y here if you have a ThrustMaster controller using the
 	  DirectConnect (BSP) protocol over the PC 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 tmdc. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called tmdc.
 
 source "drivers/input/joystick/iforce/Kconfig"
 
@@ -160,10 +138,8 @@ config JOYSTICK_WARRIOR
 	  Say Y here if you have a Logitech WingMan Warrior joystick connected
 	  to your computer's serial port. 
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called warrior.
 
 config JOYSTICK_MAGELLAN
 	tristate "LogiCad3d Magellan/SpaceMouse 6dof controllers"
@@ -172,10 +148,8 @@ config JOYSTICK_MAGELLAN
 	  Say Y here if you have a Magellan or Space Mouse 6DOF controller
 	  connected to your computer's serial port.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called magellan.
 
 config JOYSTICK_SPACEORB
 	tristate "SpaceTec SpaceOrb/Avenger 6dof controllers"
@@ -184,10 +158,8 @@ config JOYSTICK_SPACEORB
 	  Say Y here if you have a SpaceOrb 360 or SpaceBall Avenger 6DOF
 	  controller connected to your computer's serial port.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called spaceorb.
 
 config JOYSTICK_SPACEBALL
 	tristate "SpaceTec SpaceBall 6dof controllers"
@@ -197,10 +169,8 @@ config JOYSTICK_SPACEBALL
 	  controller connected to your computer's serial port. For the
 	  SpaceBall 4000 USB model, use the USB HID driver.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called spaceball.
 
 config JOYSTICK_STINGER
 	tristate "Gravis Stinger gamepad"
@@ -209,10 +179,8 @@ config JOYSTICK_STINGER
 	  Say Y here if you have a Gravis Stinger connected to one of your
 	  serial ports.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called stinger.
 
 config JOYSTICK_TWIDDLER
 	tristate "Twiddler as a joystick"
@@ -221,10 +189,8 @@ config JOYSTICK_TWIDDLER
 	  Say Y here if you have a Handykey Twiddler connected to your
 	  computer's serial port and want to use it as a joystick.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called twidjoy.
 
 config JOYSTICK_DB9
 	tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads"
@@ -236,10 +202,8 @@ config JOYSTICK_DB9
 	  For more information on how to use the driver please read
 	  <file:Documentation/input/joystick-parport.txt>.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called db9.
 
 config JOYSTICK_GAMECON
 	tristate "Multisystem, NES, SNES, N64, PSX joysticks and gamepads"
@@ -252,10 +216,8 @@ config JOYSTICK_GAMECON
 	  For more information on how to use the driver please read
 	  <file:Documentation/input/joystick-parport.txt>.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called gamecon.
 
 config JOYSTICK_TURBOGRAFX
 	tristate "Multisystem joysticks via TurboGraFX device"
@@ -266,10 +228,8 @@ config JOYSTICK_TURBOGRAFX
 	  Amstrad CPC joystick. For more information on how to use the driver
 	  please read <file:Documentation/input/joystick-parport.txt>.
 
-	  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. If you want to compile it
-	  as a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called turbografx.
 
 config JOYSTICK_AMIGA
 	tristate "Amiga joysticks"
@@ -278,10 +238,8 @@ config JOYSTICK_AMIGA
 	  Say Y here if you have an Amiga with a digital joystick connected
 	  to it.
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called amijoy.
 
 config INPUT_JOYDUMP
 	tristate "Gameport data dumper"
@@ -291,8 +249,6 @@ config INPUT_JOYDUMP
 	  log for debugging purposes. Say N if you are making a production
 	  configuration or aren't sure. 
 
-	  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. If you want to compile it as
-	  a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called joydump.
 
diff --git a/drivers/input/joystick/iforce/Kconfig b/drivers/input/joystick/iforce/Kconfig
index c0143823c073..8b0195748ad0 100644
--- a/drivers/input/joystick/iforce/Kconfig
+++ b/drivers/input/joystick/iforce/Kconfig
@@ -9,10 +9,8 @@ config JOYSTICK_IFORCE
 
 	  You also must choose at least one of the two options below.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called iforce.
 
 config JOYSTICK_IFORCE_USB
 	bool "I-Force USB joysticks and wheels"
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index d210fba2b127..eb6f03b0f9d8 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -23,10 +23,8 @@ config KEYBOARD_ATKBD
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called atkbd.
 
 config KEYBOARD_SUNKBD
 	tristate "Sun Type 4 and Type 5 keyboard support"
@@ -36,10 +34,8 @@ config KEYBOARD_SUNKBD
 	  connected either to the Sun keyboard connector or to an serial
 	  (RS-232) port via a simple adapter.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called sunkbd.
 
 config KEYBOARD_XTKBD
 	tristate "XT Keyboard support"
@@ -50,10 +46,8 @@ config KEYBOARD_XTKBD
 	  parallel port keyboard adapter, you cannot connect it to the
 	  keyboard port on a PC that runs Linux. 
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called xtkbd.
 
 config KEYBOARD_NEWTON
 	tristate "Newton keyboard"
@@ -61,10 +55,8 @@ config KEYBOARD_NEWTON
 	help
 	  Say Y here if you have a Newton keyboard on a serial port.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called newtonkbd.
 
 config KEYBOARD_MAPLE
 	tristate "Maple bus keyboard support"
@@ -73,10 +65,8 @@ config KEYBOARD_MAPLE
 	  Say Y here if you have a DreamCast console running Linux and have
 	  a keyboard attached to its Maple bus.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called maple_keyb.
 
 config KEYBOARD_AMIGA
 	tristate "Amiga keyboard"
@@ -85,10 +75,8 @@ config KEYBOARD_AMIGA
 	  Say Y here if you are running Linux on any AMIGA and have a keyboard
 	  attached.	
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called amikbd.
 
 config KEYBOARD_98KBD
 	tristate "NEC PC-9800 Keyboard support"
@@ -97,8 +85,6 @@ config KEYBOARD_98KBD
 	  Say Y here if you want to use the NEC PC-9801/PC-9821 keyboard (or
 	  compatible) on your system. 
 
-	  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
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called 98kbd.
 
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index abbc02a55047..16008a3eee8a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -21,10 +21,8 @@ config INPUT_PCSPKR
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called pcspkr.
 
 config INPUT_SPARCSPKR
 	tristate "SPARC Speaker support"
@@ -35,10 +33,8 @@ config INPUT_SPARCSPKR
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called sparcspkr.
 
 config INPUT_M68K_BEEP
 	tristate "M68k Beeper support"
@@ -55,10 +51,8 @@ config INPUT_UINPUT
 	  Say Y here if you want to support user level drivers for input
 	  subsystem accessible under char device 10:223 - /dev/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.  If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.	    
+	  To compile this driver as a module, choose M here: the
+	  module will be called uinput.
 
 config INPUT_GSC
 	tristate "PA-RISC GSC PS/2 keyboard/mouse support"
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index a6b481994163..7c5102f4f40d 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -25,10 +25,8 @@ config MOUSE_PS2
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called psmouse.
 
 config MOUSE_SERIAL
 	tristate "Serial mouse"
@@ -40,10 +38,8 @@ config MOUSE_SERIAL
 
 	  If unsure, 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 sermouse. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called sermouse.
 
 config MOUSE_INPORT
 	tristate "InPort/MS/ATIXL busmouse"
@@ -52,10 +48,8 @@ config MOUSE_INPORT
 	  Say Y here if you have an InPort, Microsoft or ATI XL busmouse.
 	  They are rather rare these days.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called inport.
 
 config MOUSE_ATIXL
 	bool "ATI XL variant"
@@ -70,10 +64,8 @@ config MOUSE_LOGIBM
 	  Say Y here if you have a Logitech busmouse.
 	  They are rather rare these days.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called logibm.
 
 config MOUSE_PC110PAD
 	tristate "IBM PC110 touchpad"
@@ -82,10 +74,8 @@ config MOUSE_PC110PAD
 	  Say Y if you have the IBM PC-110 micro-notebook and want its
 	  touchpad supported.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called pc110pad.
 
 config MOUSE_MAPLE
 	tristate "Maple bus mouse"
@@ -94,10 +84,8 @@ config MOUSE_MAPLE
 	  Say Y if you have a DreamCast console and a mouse attached to
 	  its Maple bus.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called maplemouse.
 
 config MOUSE_AMIGA
 	tristate "Amiga mouse"
@@ -106,10 +94,8 @@ config MOUSE_AMIGA
 	  Say Y here if you have an Amiga and want its native mouse
 	  supported by 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 will be called amimouse. If you want to compile it as a
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called amimouse.
 
 config MOUSE_RISCPC
 	tristate "Acorn RiscPC mouse"
@@ -118,10 +104,8 @@ config MOUSE_RISCPC
 	  Say Y here if you have the Acorn RiscPC computer and want its
 	  native mouse supported.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called rpcmouse.
 
 config MOUSE_PC9800
 	tristate "NEC PC-9800 busmouse"
@@ -130,8 +114,6 @@ config MOUSE_PC9800
 	  Say Y here if you have NEC PC-9801/PC-9821 computer and want its
 	  native mouse supported.
 
-	  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
-	  module, say M here and read <file.:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called 98busmouse.
 
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 8e86e6efee80..27ad3d67021c 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -13,10 +13,8 @@ config SERIO
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it
-	  as a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called serio.
 
 config SERIO_I8042
 	tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
@@ -29,10 +27,8 @@ config SERIO_I8042
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it
-	  as a module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called i8042.
 
 config SERIO_SERPORT
 	tristate "Serial port line discipline"
@@ -46,10 +42,8 @@ config SERIO_SERPORT
 
 	  If unsure, say Y.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called serport.
 
 config SERIO_CT82C710
 	tristate "ct82c710 Aux port controller"
@@ -61,10 +55,8 @@ config SERIO_CT82C710
 
 	  If unsure, 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 ct82c710. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called ct82c710.
 
 config SERIO_Q40KBD
 	tristate "Q40 keyboard controller"
@@ -81,10 +73,8 @@ config SERIO_PARKBD
 
 	  If unsure, 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 parkbd. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called parkbd.
 
 config SERIO_RPCKBD
 	tristate "Acorn RiscPC keyboard controller"
@@ -94,10 +84,8 @@ config SERIO_RPCKBD
 	  Say Y here if you have the Acorn RiscPC and want to use an AT
 	  keyboard connected to its keyboard controller.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called rpckbd.
 
 config SERIO_AMBAKMI
 	tristate "AMBA KMI keyboard controller"
@@ -114,10 +102,8 @@ config SERIO_98KBD
 	  Say Y here if you have the NEC PC-9801/PC-9821 and want to use its
 	  standard keyboard connected to its keyboard controller.
 
-	  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
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called 98kbd-io.
 
 config SERIO_PCIPS2
 	tristate "PCI PS/2 keyboard and PS/2 mouse controller"
@@ -126,7 +112,5 @@ config SERIO_PCIPS2
 	  Say Y here if you have a Mobility Docking station with PS/2
 	  keyboard and mice ports.
 
-	  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. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called pcips2.
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 7201dc6c10b8..26a3a229a620 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -18,10 +18,8 @@ config TOUCHSCREEN_BITSY
 
 	  If unsure, 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 gunze. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called h3600_ts_input.
 
 config TOUCHSCREEN_GUNZE
 	tristate "Gunze AHL-51S touchscreen"
@@ -32,8 +30,6 @@ config TOUCHSCREEN_GUNZE
 
 	  If unsure, 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 gunze. If you want to compile it as a
-	  module, say M here and read <file:Documentation/modules.txt>.
+	  To compile this driver as a module, choose M here: the
+	  module will be called gunze.