aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-07-22 21:47:29 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-07-22 21:47:29 -0700
commitbd072111e7319d90a7b8127f91c2806b9a6f279e (patch)
tree1686978814a2387ebfc16f9f5778a7f0caaf319b /drivers/input/serio/Kconfig
parentInput: sh_keysc - allow modifying keymap from userspace (diff)
parentLinux 2.6.31-rc4 (diff)
downloadlinux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.tar.xz
linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.zip
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'drivers/input/serio/Kconfig')
-rw-r--r--drivers/input/serio/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index da3c3a5d2689..c4b3fbd1a80f 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -192,7 +192,7 @@ config SERIO_RAW
config SERIO_XILINX_XPS_PS2
tristate "Xilinx XPS PS/2 Controller Support"
- depends on PPC
+ depends on PPC || MICROBLAZE
help
This driver supports XPS PS/2 IP from the Xilinx EDK on
PowerPC platform.