diff --git a/[refs] b/[refs]
index 957c3a32def5..4e285b47c23f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e25d780581dc4d261c66e072a59c34782bd03e0a
+refs/heads/master: 090800c2a3f746572ef142e2d5404922a599e841
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index 37df92ffba50..6d5d2667750c 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -596,7 +596,7 @@ config HID_SPEEDLINK
 	---help---
 	Support for Speedlink Vicious and Divine Cezanne mouse.
 
-config HID_STEELSERIES_SRWS1
+config HID_STEELSERIES
 	tristate "Steelseries SRW-S1 steering wheel support"
 	depends on USB_HID
 	---help---
diff --git a/trunk/drivers/hid/Makefile b/trunk/drivers/hid/Makefile
index bbebe0a49798..247f2b81677a 100644
--- a/trunk/drivers/hid/Makefile
+++ b/trunk/drivers/hid/Makefile
@@ -101,7 +101,7 @@ obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o
 obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o
 obj-$(CONFIG_HID_SONY)		+= hid-sony.o
 obj-$(CONFIG_HID_SPEEDLINK)	+= hid-speedlink.o
-obj-$(CONFIG_HID_STEELSERIES_SRWS1)    	+= hid-steelseries-srws1.o
+obj-$(CONFIG_HID_STEELSERIES)	+= hid-steelseries.o
 obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o
 obj-$(CONFIG_HID_GREENASIA)	+= hid-gaff.o
 obj-$(CONFIG_HID_THRUSTMASTER)	+= hid-tmff.o
diff --git a/trunk/drivers/hid/hid-steelseries-srws1.c b/trunk/drivers/hid/hid-steelseries.c
similarity index 100%
rename from trunk/drivers/hid/hid-steelseries-srws1.c
rename to trunk/drivers/hid/hid-steelseries.c