diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-30 10:16:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-30 10:16:51 -0800 |
| commit | efdd17f89510531a6529e20048670bef9a073466 (patch) | |
| tree | 1fbd09b589c4548a030e1319b6663f3970d02476 /drivers/hid/hid-holtekff.c | |
| parent | kbuild: add '-fno-stack-check' to kernel build options (diff) | |
| parent | HID: core: lower log level for unknown main item tags to warnings (diff) | |
| download | linux-dev-efdd17f89510531a6529e20048670bef9a073466.tar.xz linux-dev-efdd17f89510531a6529e20048670bef9a073466.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- two cosmetic fixes from Daniel Axtens and Hans de Goede
- fix for I2C command mismatch fix for cp2112 driver from Eudean Sun
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: core: lower log level for unknown main item tags to warnings
HID: holtekff: move MODULE_* parameters out of #ifdef block
HID: cp2112: Fix I2C_BLOCK_DATA transactions
Diffstat (limited to 'drivers/hid/hid-holtekff.c')
| -rw-r--r-- | drivers/hid/hid-holtekff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c index 9325545fc3ae..edc0f64bb584 100644 --- a/drivers/hid/hid-holtekff.c +++ b/drivers/hid/hid-holtekff.c @@ -32,10 +32,6 @@ #ifdef CONFIG_HOLTEK_FF -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Anssi Hannula <anssi.hannula@iki.fi>"); -MODULE_DESCRIPTION("Force feedback support for Holtek On Line Grip based devices"); - /* * These commands and parameters are currently known: * @@ -223,3 +219,7 @@ static struct hid_driver holtek_driver = { .probe = holtek_probe, }; module_hid_driver(holtek_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Anssi Hannula <anssi.hannula@iki.fi>"); +MODULE_DESCRIPTION("Force feedback support for Holtek On Line Grip based devices"); |