diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-08-06 17:07:49 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-06 18:14:55 -0400 |
commit | f2e0a7d4a0b94b4274e3b7e15bf650d45a866f3c (patch) | |
tree | eb61d86fe87531d506d9996ae841f6a7e632487d /drivers | |
parent | 7403a6a448c3ed96221bb46c9da75254fd87b520 (diff) |
Input: wacom - only register once the MODULE_* macros
Putting the various MODULE_* makes them appear several times in modinfo
because wacom.h is used both in wacom_sys.c and wacom_wac.h.
Having the macros near the module declaration makes them appear only once.
Add also MODULE_VERSION(DRIVER_VERSION) to export the current version
number.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/wacom.h | 4 | ||||
-rw-r--r-- | drivers/hid/wacom_sys.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h index 8cc4406b8a53..64bc1b296d91 100644 --- a/drivers/hid/wacom.h +++ b/drivers/hid/wacom.h | |||
@@ -101,10 +101,6 @@ | |||
101 | #define DRIVER_DESC "USB Wacom tablet driver" | 101 | #define DRIVER_DESC "USB Wacom tablet driver" |
102 | #define DRIVER_LICENSE "GPL" | 102 | #define DRIVER_LICENSE "GPL" |
103 | 103 | ||
104 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
105 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
106 | MODULE_LICENSE(DRIVER_LICENSE); | ||
107 | |||
108 | #define USB_VENDOR_ID_WACOM 0x056a | 104 | #define USB_VENDOR_ID_WACOM 0x056a |
109 | #define USB_VENDOR_ID_LENOVO 0x17ef | 105 | #define USB_VENDOR_ID_LENOVO 0x17ef |
110 | 106 | ||
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 6e0c19146a79..3e388ec31da8 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c | |||
@@ -1449,3 +1449,8 @@ static struct hid_driver wacom_driver = { | |||
1449 | .raw_event = wacom_raw_event, | 1449 | .raw_event = wacom_raw_event, |
1450 | }; | 1450 | }; |
1451 | module_hid_driver(wacom_driver); | 1451 | module_hid_driver(wacom_driver); |
1452 | |||
1453 | MODULE_VERSION(DRIVER_VERSION); | ||
1454 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
1455 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
1456 | MODULE_LICENSE(DRIVER_LICENSE); | ||