diff options
author | Dmitry Torokhov | 2014-01-23 17:10:44 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2014-01-23 17:10:44 +0100 |
commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /arch/sparc/Kconfig | |
parent | Input: xpad - add new USB IDs for Logitech F310 and F710 (diff) | |
parent | Input: wacom - add support for DTU-1031 (diff) | |
download | kernel-qcow2-linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.gz kernel-qcow2-linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz kernel-qcow2-linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index d4f7a6a163dc..034a680ffec2 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -13,6 +13,7 @@ config SPARC bool default y select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI + select ARCH_MIGHT_HAVE_PC_SERIO select OF select OF_PROMTREE select HAVE_IDE |