]> rtime.felk.cvut.cz Git - linux-imx.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)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 11 Jun 2013 04:37:57 +0000 (21:37 -0700)
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>
Cc: stable@vger.kernel.org # 3.9
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 aebfe3ecb9451638b21714949caff6c9c381fbf8..1bda828f4b5546cda5820cec874e66277a01a6f6 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.