diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:37:30 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:37:30 -0800 |
| commit | d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8 (patch) | |
| tree | 56e92b487de80090a998ff3c0469375982156802 /drivers/input/joystick | |
| parent | 060403f34008af90e310d7e0e7531ebb3acf9557 (diff) | |
| parent | fafef982c7353e8982b951e40573e990ccf0ed00 (diff) | |
| download | linux-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.tar.bz2 | |
Merge branch 'next' into for-linus
Prepare input updates for 4.16 merge window.
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index d88d3e0f59fb..9d2688f3f961 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -84,9 +84,6 @@ #include <linux/usb/input.h> #include <linux/usb/quirks.h> -#define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>" -#define DRIVER_DESC "X-Box pad driver" - #define XPAD_PKT_LEN 64 /* xbox d-pads should map to buttons, as is required for DDR pads @@ -1943,6 +1940,6 @@ static struct usb_driver xpad_driver = { module_usb_driver(xpad_driver); -MODULE_AUTHOR(DRIVER_AUTHOR); -MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_AUTHOR("Marko Friedemann <mfr@bmx-chemnitz.de>"); +MODULE_DESCRIPTION("X-Box pad driver"); MODULE_LICENSE("GPL"); |