Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 1e691a3a79cb..5a96acb667ea 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -2,7 +2,7 @@
 # Input core configuration
 #
 config SERIO
-        tristate "Serial I/O support" if EXPERT || !X86
+        tristate "Serial I/O support"
         default y
         help
           Say Yes here if you have any input device that uses serial I/O to
@@ -19,7 +19,7 @@ config SERIO
 if SERIO
 
 config SERIO_I8042
-        tristate "i8042 PC Keyboard controller" if EXPERT || !X86
+        tristate "i8042 PC Keyboard controller"
         default y
         depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
                    (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \
@@ -170,7 +170,7 @@ config SERIO_MACEPS2
           module will be called maceps2.
 
 config SERIO_LIBPS2
-        tristate "PS/2 driver library" if EXPERT
+        tristate "PS/2 driver library"
         depends on SERIO_I8042 || SERIO_I8042=n
         help
           Say Y here if you are using a driver for device connected
@@ -239,7 +239,6 @@ config SERIO_PS2MULT
 
 config SERIO_ARC_PS2
         tristate "ARC PS/2 support"
-        depends on GENERIC_HARDIRQS
         help
           Say Y here if you have an ARC FPGA platform with a PS/2
           controller in it.
@@ -267,4 +266,14 @@ config SERIO_OLPC_APSP
           To compile this driver as a module, choose M here: the module will
           be called olpc_apsp.
 
+config HYPERV_KEYBOARD
+        tristate "Microsoft Synthetic Keyboard driver"
+        depends on HYPERV
+        default HYPERV
+        help
+          Select this option to enable the Hyper-V Keyboard driver.
+
+          To compile this driver as a module, choose M here: the module will
+          be called hyperv_keyboard.
+
 endif