Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision 31fb9a02a94c2fe4691399bb40bcffb385c3f810)
+++ defaults/amd64/Makefile.config	(revision a0e1b48209ddcecbae3a971fb6275aa891cdee60)
@@ -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