diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-09 09:38:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-09 09:38:42 +0200 |
| commit | a230e95cc66a5a27e53459187ffcedb65b2782c3 (patch) | |
| tree | 55b63047d36fd42f4920762318aae6da404e02b3 /drivers/input/misc/axp20x-pek.c | |
| parent | 3fbdc379567aef1c43b4be110179b541d68afdf6 (diff) | |
| parent | 6b30c73e9f37183ad60c7f7050acf8e8edf91e9c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Just small ALPS and Elan touchpads, and other driver fixups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elantech - add special check for fw_version 0x470f01 touchpad
Input: twl4030-vibra - fix ERROR: Bad of_node_put() warning
Input: alps - only Dell laptops have separate button bits for v2 dualpoint sticks
Input: axp20x-pek - add module alias
Input: turbografx - fix potential out of bound access
Diffstat (limited to 'drivers/input/misc/axp20x-pek.c')
| -rw-r--r-- | drivers/input/misc/axp20x-pek.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c index 10e140af5aac..1ac898db303a 100644 --- a/drivers/input/misc/axp20x-pek.c +++ b/drivers/input/misc/axp20x-pek.c @@ -292,3 +292,4 @@ module_platform_driver(axp20x_pek_driver); MODULE_DESCRIPTION("axp20x Power Button"); MODULE_AUTHOR("Carlo Caione <carlo@caione.org>"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:axp20x-pek"); |