diff --git a/[refs] b/[refs]
index db9751de7aea..b4eb3178fdd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 140ae3eb6feb6ae96ba1ff073049beb985ea00e8
+refs/heads/master: 550cb3c3c1fa48171c6358b8641bd01119f5386f
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index f5999a91614e..b4fd8ca701a4 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/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