projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
input
/
misc
/
max77693-haptic.c
diff --git
a/drivers/input/misc/max77693-haptic.c
b/drivers/input/misc/max77693-haptic.c
index
29ddeb7
..
46b0f48
100644
(file)
--- a/
drivers/input/misc/max77693-haptic.c
+++ b/
drivers/input/misc/max77693-haptic.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 2014,2015 Samsung Electronics
* Jaewon Kim <jaewon02.kim@samsung.com>
*
* Copyright (C) 2014,2015 Samsung Electronics
* Jaewon Kim <jaewon02.kim@samsung.com>
- * Krzysztof Kozlowski <k
.kozlowski@samsung.com
>
+ * Krzysztof Kozlowski <k
rzk@kernel.org
>
*
* This program is not provided / owned by Maxim Integrated Products.
*
*
* This program is not provided / owned by Maxim Integrated Products.
*
@@
-426,7
+426,7
@@
static struct platform_driver max77693_haptic_driver = {
module_platform_driver(max77693_haptic_driver);
MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
module_platform_driver(max77693_haptic_driver);
MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
-MODULE_AUTHOR("Krzysztof Kozlowski <k
.kozlowski@samsung.com
>");
+MODULE_AUTHOR("Krzysztof Kozlowski <k
rzk@kernel.org
>");
MODULE_DESCRIPTION("MAXIM 77693/77843 Haptic driver");
MODULE_ALIAS("platform:max77693-haptic");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("MAXIM 77693/77843 Haptic driver");
MODULE_ALIAS("platform:max77693-haptic");
MODULE_LICENSE("GPL");