]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: add missing dependencies on CONFIG_HAS_IOMEM
authorBen Hutchings <ben@decadent.org.uk>
Mon, 10 Jun 2013 18:05:40 +0000 (11:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jun 2013 17:39:08 +0000 (10:39 -0700)
commit 150e5928d6063b273a80d9d6722417ac3c93ff82 upstream.

Several drivers don't build on s390 with CONFIG_PCI disabled as
they require MMIO functions.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/input/keyboard/Kconfig
drivers/input/serio/Kconfig

index ac050066700086d2477d1e56f459bc6bc6f313d2..c62ca1b47a37d29f1164e7e57c3d7964a532be96 100644 (file)
@@ -431,6 +431,7 @@ config KEYBOARD_TEGRA
 
 config KEYBOARD_OPENCORES
        tristate "OpenCores Keyboard Controller"
+       depends on HAS_IOMEM
        help
          Say Y here if you want to use the OpenCores Keyboard Controller
          http://www.opencores.org/project,keyboardcontroller
index 3ec5ef2dd443145ae70588043c1705a632d587cd..dbe1af505b3bc7a76a0fcb1aa44a75ae3d01a47b 100644 (file)
@@ -205,6 +205,7 @@ config SERIO_XILINX_XPS_PS2
 
 config SERIO_ALTERA_PS2
        tristate "Altera UP PS/2 controller"
+       depends on HAS_IOMEM
        help
          Say Y here if you have Altera University Program PS/2 ports.