diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 21:56:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 21:56:27 -0500 |
| commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
| tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | b7a8399edfd7ad3da36d51513ea30a4708b02b52 (diff) | |
| parent | 7c81c60f3789a082e141d7a013392af5f78db16a (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon updates from Jean Delvare:
"This include it87 driver improvements, and a tree-wide change of my
e-mail address"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
Update Jean Delvare's e-mail address
hwmon: (it87) Print proper names for the IT8771E and IT8772E
hwmon: (it87) Add support for the ITE IT8603E
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-bit.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index fad22b0bb5b0..b7a6acfcb300 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | * ------------------------------------------------------------------------- */ | 20 | * ------------------------------------------------------------------------- */ |
| 21 | 21 | ||
| 22 | /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki | 22 | /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki |
| 23 | <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ | 23 | <kmalkki@cc.hut.fi> and Jean Delvare <jdelvare@suse.de> */ |
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |