Merge branch 'topstar-laptop' into release

[deliverable/linux.git] / drivers / hid / hid-lg.c

diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 7afbaa0efd1812fedeeaeea934467138c5efb417..0f870a3243ed1ef2a9870c4a32c63b7519975c03 100644 (file)
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -299,6 +299,8 @@ static const struct hid_device_id lg_devices[] = {
                .driver_data = LG_FF },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL),
                .driver_data = LG_FF },
+       { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ),
+               .driver_data = LG_FF },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),
                .driver_data = LG_FF2 },
        { }
@@ -315,12 +317,12 @@ static struct hid_driver lg_driver = {
        .probe = lg_probe,
 };
 
-static int lg_init(void)
+static int __init lg_init(void)
 {
        return hid_register_driver(&lg_driver);
 }
 
-static void lg_exit(void)
+static void __exit lg_exit(void)
 {
        hid_unregister_driver(&lg_driver);
 }