Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 498cde3..dd5227c 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -309,18 +309,6 @@ config INPUT_GPIO_VIBRA
          To compile this driver as a module, choose M here: the module will be
          called gpio-vibra.
 
-config INPUT_IXP4XX_BEEPER
-       tristate "IXP4XX Beeper support"
-       depends on ARCH_IXP4XX
-       help
-         If you say yes here, you can connect a beeper to the
-         ixp4xx gpio pins. This is used by the LinkSys NSLU2.
-
-         If unsure, say Y.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ixp4xx-beeper.
-
 config INPUT_COBALT_BTNS
        tristate "Cobalt button interface"
        depends on MIPS_COBALT
@@ -811,16 +799,6 @@ config INPUT_XEN_KBDDEV_FRONTEND
          To compile this driver as a module, choose M here: the
          module will be called xen-kbdfront.
 
-config INPUT_SIRFSOC_ONKEY
-       tristate "CSR SiRFSoC power on/off/suspend key support"
-       depends on ARCH_SIRF && OF
-       default y
-       help
-         Say Y here if you want to support for the SiRFSoC power on/off/suspend key
-         in Linux, after you press the onkey, system will suspend.
-
-         If unsure, say N.
-
 config INPUT_IDEAPAD_SLIDEBAR
        tristate "IdeaPad Laptop Slidebar"
        depends on INPUT