diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 21:49:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:21 -0700 |
| commit | f4b50261207c987913f076d867c2e154d71fd012 (patch) | |
| tree | 0b50cfa93f2e1e6a877f51028f93539db0e4547e /drivers/hwmon/adm1026.c | |
| parent | 96478ef3f3f71fa929cc905cc794993e312d9a5d (diff) | |
| download | kernel_samsung_smdk4412-f4b50261207c987913f076d867c2e154d71fd012.zip kernel_samsung_smdk4412-f4b50261207c987913f076d867c2e154d71fd012.tar.gz kernel_samsung_smdk4412-f4b50261207c987913f076d867c2e154d71fd012.tar.bz2 | |
[PATCH] hwmon: hwmon vs i2c, second round (06/11)
The only thing left in i2c-sensor.h are module parameter definition
macros. It's only an extension of what i2c.h offers, and this extension
is not sensors-specific. As a matter of fact, a few non-sensors drivers
use them. So we better merge them in i2c.h, and get rid of i2c-sensor.h
altogether.
Signed-off-by: Jean Delvare <khali@linux-fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/adm1026.c')
| -rw-r--r-- | drivers/hwmon/adm1026.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index f3a78f7..f32f819 100644 --- a/drivers/hwmon/adm1026.c +++ b/drivers/hwmon/adm1026.c @@ -28,7 +28,6 @@ #include <linux/slab.h> #include <linux/jiffies.h> #include <linux/i2c.h> -#include <linux/i2c-sensor.h> #include <linux/i2c-vid.h> #include <linux/hwmon-sysfs.h> #include <linux/hwmon.h> @@ -38,7 +37,7 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; /* Insmod parameters */ -SENSORS_INSMOD_1(adm1026); +I2C_CLIENT_INSMOD_1(adm1026); static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |