Merge master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f5999a91614e668aade684ccbb89fcaf5e1eba86..b4fd8ca701a44d4ff32d3f2bedb6b3c8b706f72d 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -247,7 +247,6 @@ config HID_SUNPLUS
 
 config THRUSTMASTER_FF
        tristate "ThrustMaster devices support"
-       default m
        depends on USB_HID
        select INPUT_FF_MEMLESS
        help
@@ -256,7 +255,6 @@ config THRUSTMASTER_FF
 
 config ZEROPLUS_FF
        tristate "Zeroplus based game controller support"
-       default m
        depends on USB_HID
        select INPUT_FF_MEMLESS
        help