summaryrefslogtreecommitdiffstats
path: root/arch/alpha/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-23 17:10:44 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-23 17:10:44 +0100
commit55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch)
tree0850f490489e5b941692f3fe36dff5d2c1c35c3c /arch/alpha/Kconfig
parentInput: xpad - add new USB IDs for Logitech F310 and F710 (diff)
parentInput: wacom - add support for DTU-1031 (diff)
downloadlinux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz
linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'arch/alpha/Kconfig')
-rw-r--r--arch/alpha/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index d39dc9b95a2c..7ce5ce586bd9 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -2,6 +2,7 @@ config ALPHA
bool
default y
select ARCH_MIGHT_HAVE_PC_PARPORT
+ select ARCH_MIGHT_HAVE_PC_SERIO
select HAVE_AOUT
select HAVE_IDE
select HAVE_OPROFILE