diff --git a/[refs] b/[refs]
index 282125375bf2..3101f6d3cd79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44ea35c138d400b3aeeb2a5317edd4634e6823e3
+refs/heads/master: 2701eaabd7599a2aebae22caf00869a383d66a05
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index 1f0b229f7dfc..0a55866f1f74 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -594,7 +594,7 @@ config SMARTJOYPLUS_FF
 	Say Y here if you have a SmartJoy PLUS PS2/USB adapter and want to
 	enable force feedback support for it.
 
-config HID_TIVO_SLIDE
+config HID_TIVO
 	tristate "TiVo Slide Bluetooth remote control support"
 	depends on USB_HID
 	---help---