@@ -101,10 +101,6 @@
#define DRIVER_DESC "USB Wacom tablet driver"
#define DRIVER_LICENSE "GPL"
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
-
#define USB_VENDOR_ID_WACOM 0x056a
#define USB_VENDOR_ID_LENOVO 0x17ef
@@ -1437,6 +1437,11 @@ static int wacom_reset_resume(struct hid_device *hdev)
return wacom_resume(hdev);
}
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE(DRIVER_LICENSE);
+
static struct hid_driver wacom_driver = {
.name = "wacom",
.id_table = wacom_ids,
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> --- Dmitry, I guess this one could sneak on top of your pull request too. If not, then I'll push Jiri to take it in one of the future rc :) Cheers, Benjamin drivers/hid/wacom.h | 4 ---- drivers/hid/wacom_sys.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)