diff --git a/[refs] b/[refs]
index cc97c8a40e1d..2d0ef09f7b54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18e10aba7f2a41767b9aa97911696c28d0f29083
+refs/heads/master: 70c2cabd6ab6616490c7920ade9fd4143e539884
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index 6ae234f21453..410eaa902495 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -282,6 +282,7 @@ config LOGIWHEELS_FF
 	bool "Logitech wheels configuration and force feedback support"
 	depends on HID_LOGITECH
 	select INPUT_FF_MEMLESS
+	default LOGITECH_FF
 	help
 	  Say Y here if you want to enable force feedback and range setting
 	  support for following Logitech wheels: