4 files changed, 3 insertions, 15 deletions

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 5f6496375404..8d2f2daba0c0 100644
--- 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 9a304d854e33..de3cc130ab8e 100644
--- 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 1d4163b9f0b7..eaa7081fef8f 100644
--- 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 6256233d2bfb..bcb1fdedb595 100644
--- 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.