Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

[pandora-kernel.git] / arch / arm / mach-omap1 / Kconfig

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 5f64963..8d2f2da 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)