Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c79dec81a80135b6a9702dd65e3d0e987a..679bde34d2478f058330711322ca03c7bf51b6ba 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD
          However, it has been thoroughly tested and is stable.
 
          If you want full HIL support including support for multiple
-         keyboards, mices and tablets, you have to enable the
+         keyboards, mice, and tablets, you have to enable the
          "HP System Device Controller i8042 Support" in the input/serio
          submenu.