---

yaml --- r: 291657 b: refs/heads/master c: 2701eaa h: refs/heads/master i: 291655: 151d433 v: v3
git-mirror · Feb 6, 2012 · 924e0ae · 924e0ae
1 parent 5bb2862
commit 924e0ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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---