Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision 31fb9a02a94c2fe4691399bb40bcffb385c3f810)
+++ defaults/amd64/Makefile.config	(revision 67a88c34de6b29d84b4ea8c0f06dfa98cbcf09bd)
@@ -35,12 +35,9 @@
 CONFIG_TEST = y
 
-# What is your input device?
-CONFIG_HID_IN = keyboard
+# Input device class
+CONFIG_HID_IN = generic
 
-# What is your output device?
-CONFIG_HID_OUT = monitor
-
-# i8042 controller support
-CONFIG_I8042 = y
+# Output device class
+CONFIG_HID_OUT = generic
 
 # PC keyboard support
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision 31fb9a02a94c2fe4691399bb40bcffb385c3f810)
+++ defaults/ia32/Makefile.config	(revision 67a88c34de6b29d84b4ea8c0f06dfa98cbcf09bd)
@@ -41,12 +41,9 @@
 CONFIG_TEST = y
 
-# What is your input device?
-CONFIG_HID_IN = keyboard
+# Input device class
+CONFIG_HID_IN = generic
 
-# What is your output device?
-CONFIG_HID_OUT = monitor
-
-# i8042 controller support
-CONFIG_I8042 = y
+# Output device class
+CONFIG_HID_OUT = generic
 
 # PC keyboard support
Index: defaults/mips32/GXemul/Makefile.config
===================================================================
--- defaults/mips32/GXemul/Makefile.config	(revision 31fb9a02a94c2fe4691399bb40bcffb385c3f810)
+++ defaults/mips32/GXemul/Makefile.config	(revision 67a88c34de6b29d84b4ea8c0f06dfa98cbcf09bd)
@@ -1,8 +1,2 @@
 # Machine type
 MACHINE = lgxemul
-
-# Input device class
-CONFIG_HID_IN = keyboard
-
-# Output device class
-CONFIG_HID_OUT = monitor
Index: defaults/mips32/Makefile.config
===================================================================
--- defaults/mips32/Makefile.config	(revision 31fb9a02a94c2fe4691399bb40bcffb385c3f810)
+++ defaults/mips32/Makefile.config	(revision 67a88c34de6b29d84b4ea8c0f06dfa98cbcf09bd)
@@ -29,4 +29,10 @@
 CONFIG_TEST = y
 
+# Input device class
+CONFIG_HID_IN = generic
+
+# Output device class
+CONFIG_HID_OUT = generic
+
 # Keyboard layout
 KBD_LAYOUT = us_qwerty