summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-wiimote.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-07 09:48:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-07 09:48:41 -0700
commitb04c99e3b845892d754ee8052d6324c39c4040de (patch)
treef2bcedc7977a43b731a0b5cb1030136d40ea2c1e /drivers/hid/hid-wiimote.h
parent44598f98b98e54beca34dc836b38eaea40be1abf (diff)
downloadlinux-b04c99e3b845892d754ee8052d6324c39c4040de.tar.gz
linux-b04c99e3b845892d754ee8052d6324c39c4040de.tar.bz2
linux-b04c99e3b845892d754ee8052d6324c39c4040de.zip
Revert "Input: introduce BTN/ABS bits for drums and guitars"
This reverts commits 61e00655e9cb, 73f8645db191 and 8e22ecb603c8: "Input: introduce BTN/ABS bits for drums and guitars" "HID: wiimote: add support for Guitar-Hero drums" "HID: wiimote: add support for Guitar-Hero guitars" The extra new ABS_xx values resulted in ABS_MAX no longer being a power-of-two, which broke the comparison logic. It also caused the ioctl numbers to overflow into the next byte, causing problems for that. We'll try again for 3.13. Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de> Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: David Herrmann <dh.herrmann@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hid/hid-wiimote.h')
-rw-r--r--drivers/hid/hid-wiimote.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h
index 379cdfb6bd25..f1474f372c0b 100644
--- a/drivers/hid/hid-wiimote.h
+++ b/drivers/hid/hid-wiimote.h
@@ -88,8 +88,6 @@ enum wiimote_exttype {
WIIMOTE_EXT_CLASSIC_CONTROLLER,
WIIMOTE_EXT_BALANCE_BOARD,
WIIMOTE_EXT_PRO_CONTROLLER,
- WIIMOTE_EXT_GUITAR_HERO_DRUMS,
- WIIMOTE_EXT_GUITAR_HERO_GUITAR,
WIIMOTE_EXT_NUM,
};
@@ -137,7 +135,6 @@ struct wiimote_state {
/* calibration data */
__u16 calib_bboard[4][3];
- __u8 pressure_drums[7];
};
struct wiimote_data {