aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers
diff options
context:
space:
mode:
authorNikolai Kondrashov <spbnick@gmail.com>2011-01-28 14:50:51 +0300
committerJiri Kosina <jkosina@suse.cz>2011-02-01 11:01:06 +0100
commit152fd6347e63d176d1f03c8d142e534a5227ef3f (patch)
tree8d052a5b0e0625ba0c194771adf81b5f859d2f07 /drivers
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff)
downloadwireguard-linux-152fd6347e63d176d1f03c8d142e534a5227ef3f.tar.xz
wireguard-linux-152fd6347e63d176d1f03c8d142e534a5227ef3f.zip
HID: rename hid-drff.c to hid-dr.c
Rename drivers/hid/hid-drff.c (a DragonRise Inc. force feedback gamepad driver) to driver/hid/hid-dr.c. This prepares it for addition of support for another gamepad, without force feedback. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/Makefile2
-rw-r--r--drivers/hid/hid-dr.c (renamed from drivers/hid/hid-drff.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 6efc2a0370ad..bb744e6f75e6 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -34,7 +34,7 @@ obj-$(CONFIG_HID_CANDO) += hid-cando.o
obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
-obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o
+obj-$(CONFIG_HID_DRAGONRISE) += hid-dr.o
obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o
obj-$(CONFIG_HID_EGALAX) += hid-egalax.o
obj-$(CONFIG_HID_ELECOM) += hid-elecom.o
diff --git a/drivers/hid/hid-drff.c b/drivers/hid/hid-dr.c
index afcf3d67eb02..afcf3d67eb02 100644
--- a/drivers/hid/hid-drff.c
+++ b/drivers/hid/hid-dr.c