Merge remote-tracking branch 'xfs/for-next'

[karo-tx-linux.git] / drivers / hid / hid-wiimote.h

diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h
index 379cdfb6bd258bea39c04341cf8d497b206c730e..75db0c4000377f03bf262eb66a5492046aa012c8 100644 (file)
--- 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,
 };
 
@@ -135,14 +133,15 @@ struct wiimote_state {
        __u8 *cmd_read_buf;
        __u8 cmd_read_size;
 
-       /* calibration data */
+       /* calibration/cache data */
        __u16 calib_bboard[4][3];
-       __u8 pressure_drums[7];
+       __u8 cache_rumble;
 };
 
 struct wiimote_data {
        struct hid_device *hdev;
        struct input_dev *input;
+       struct work_struct rumble_worker;
        struct led_classdev *leds[4];
        struct input_dev *accel;
        struct input_dev *ir;