projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
i2c
/
i2c-smbus.c
diff --git
a/drivers/i2c/i2c-smbus.c
b/drivers/i2c/i2c-smbus.c
index
c99b229
..
9ebf9cb
100644
(file)
--- a/
drivers/i2c/i2c-smbus.c
+++ b/
drivers/i2c/i2c-smbus.c
@@
-2,7
+2,7
@@
* i2c-smbus.c - SMBus extensions to the I2C protocol
*
* Copyright (C) 2008 David Brownell
* i2c-smbus.c - SMBus extensions to the I2C protocol
*
* Copyright (C) 2008 David Brownell
- * Copyright (C) 2010 Jean Delvare <
khali@linux-fr.org
>
+ * Copyright (C) 2010 Jean Delvare <
jdelvare@suse.de
>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-13,11
+13,6
@@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-246,6
+241,6
@@
EXPORT_SYMBOL_GPL(i2c_handle_smbus_alert);
module_i2c_driver(smbalert_driver);
module_i2c_driver(smbalert_driver);
-MODULE_AUTHOR("Jean Delvare <
khali@linux-fr.org
>");
+MODULE_AUTHOR("Jean Delvare <
jdelvare@suse.de
>");
MODULE_DESCRIPTION("SMBus protocol extensions support");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SMBus protocol extensions support");
MODULE_LICENSE("GPL");