OMAP1: drop AMS_DELTA_FIQ config option

This patches removes a config option that was used to select a FIQ
handler to be build for Amstrad Delta, as required by the on-board serio
interface driver. Not having any problem reports received since it was
introduced in 2.6.35, the FIQ handler can now be built and initialized by
default, thus reqiring no extra config option.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 5f649637540403aedc3bfacabb5a2705bad6ccf0..8d2f2daba0c001f2cfdffa637cc0478d9f1c563b 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -152,20 +152,11 @@ config MACH_NOKIA770
 config MACH_AMS_DELTA
        bool "Amstrad E3 (Delta)"
        depends on ARCH_OMAP1 && ARCH_OMAP15XX
+       select FIQ
        help
          Support for the Amstrad E3 (codename Delta) videophone. Say Y here
          if you have such a device.
 
-config AMS_DELTA_FIQ
-       bool "Fast Interrupt Request (FIQ) support for the E3"
-       depends on MACH_AMS_DELTA
-       select FIQ
-       help
-         Provide a FIQ handler for the E3.
-         This allows for fast handling of interrupts generated
-         by the clock line of the E3 mailboard (or a PS/2 keyboard)
-         connected to the GPIO based external keyboard port.
-
 config MACH_OMAP_GENERIC
        bool "Generic OMAP board"
        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 9a304d854e3343486d4410ce6696d80a67aebffe..de3cc130ab8e182dacde7d7e949c4952deeb8216 100644 (file)
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -39,8 +39,8 @@ obj-$(CONFIG_MACH_OMAP_PALMTE)                += board-palmte.o
 obj-$(CONFIG_MACH_OMAP_PALMZ71)                += board-palmz71.o
 obj-$(CONFIG_MACH_OMAP_PALMTT)         += board-palmtt.o
 obj-$(CONFIG_MACH_NOKIA770)            += board-nokia770.o
-obj-$(CONFIG_MACH_AMS_DELTA)           += board-ams-delta.o
-obj-$(CONFIG_AMS_DELTA_FIQ)            += ams-delta-fiq.o ams-delta-fiq-handler.o
+obj-$(CONFIG_MACH_AMS_DELTA)           += board-ams-delta.o ams-delta-fiq.o \
+                                          ams-delta-fiq-handler.o
 obj-$(CONFIG_MACH_SX1)                 += board-sx1.o board-sx1-mmc.o
 obj-$(CONFIG_MACH_HERALD)              += board-htcherald.o
 

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 1d4163b9f0b71f36881841350f66c2eedc73f566..eaa7081fef8f67dac1e4fd9c4fa89ce77c11db4d 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -307,9 +307,7 @@ static void __init ams_delta_init(void)
 #endif
        platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
 
-#ifdef CONFIG_AMS_DELTA_FIQ
        ams_delta_init_fiq();
-#endif
 
        omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1);
 }

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 6256233d2bfb12eef200e310da75f6a4e6468afc..bcb1fdedb595b638bfb8dd50b33d132171e12662 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -214,7 +214,6 @@ config SERIO_AMS_DELTA
        tristate "Amstrad Delta (E3) mailboard support"
        depends on MACH_AMS_DELTA
        default y
-       select AMS_DELTA_FIQ
        ---help---
          Say Y here if you have an E3 and want to use its mailboard,
          or any standard AT keyboard connected to the mailboard port.