diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/hwmon/ads7828.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/hwmon/ads7828.c')
| -rw-r--r-- | drivers/hwmon/ads7828.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c index aac85f3aed50..c42c5a69a664 100644 --- a/drivers/hwmon/ads7828.c +++ b/drivers/hwmon/ads7828.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | This driver is based on the lm75 and other lm_sensors/hwmon drivers | 5 | This driver is based on the lm75 and other lm_sensors/hwmon drivers |
| 6 | 6 | ||
| 7 | Written by Steve Hardy <steve@linuxrealtime.co.uk> | 7 | Written by Steve Hardy <shardy@redhat.com> |
| 8 | 8 | ||
| 9 | Datasheet available at: http://focus.ti.com/lit/ds/symlink/ads7828.pdf | 9 | Datasheet available at: http://focus.ti.com/lit/ds/symlink/ads7828.pdf |
| 10 | 10 | ||
| @@ -271,7 +271,7 @@ static void __exit sensors_ads7828_exit(void) | |||
| 271 | i2c_del_driver(&ads7828_driver); | 271 | i2c_del_driver(&ads7828_driver); |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | MODULE_AUTHOR("Steve Hardy <steve@linuxrealtime.co.uk>"); | 274 | MODULE_AUTHOR("Steve Hardy <shardy@redhat.com>"); |
| 275 | MODULE_DESCRIPTION("ADS7828 driver"); | 275 | MODULE_DESCRIPTION("ADS7828 driver"); |
| 276 | MODULE_LICENSE("GPL"); | 276 | MODULE_LICENSE("GPL"); |
| 277 | 277 | ||