diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-01-06 14:32:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-01-06 14:32:28 +0100 |
| commit | b6e152d2d10f0cd1b187954a1abb6c87bc865d0f (patch) | |
| tree | 765c03462276f9e2d70a07019e85d78acd155315 /drivers/hid/hid-core.c | |
| parent | 9377a6e0dff05c90db0901d0296aba5262a28c67 (diff) | |
| parent | 7021b60073f8059e1ec8aa140eb5fdfc017d0041 (diff) | |
Merge branch 'for-4.11/upstream' into for-next
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 3c8af87efbee..9351241c95d5 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -43,7 +43,6 @@ */ #define DRIVER_DESC "HID core driver" -#define DRIVER_LICENSE "GPL" int hid_debug = 0; module_param_named(debug, hid_debug, int, 0600); @@ -2865,5 +2864,5 @@ module_exit(hid_exit); MODULE_AUTHOR("Andreas Gal"); MODULE_AUTHOR("Vojtech Pavlik"); MODULE_AUTHOR("Jiri Kosina"); -MODULE_LICENSE(DRIVER_LICENSE); +MODULE_LICENSE("GPL"); |