diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/hwmon/asb100.c | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/hwmon/asb100.c')
| -rw-r--r-- | drivers/hwmon/asb100.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c index 8a45a2e6ba8a..8acf82977e7b 100644 --- a/drivers/hwmon/asb100.c +++ b/drivers/hwmon/asb100.c | |||
| @@ -53,7 +53,10 @@ static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END }; | |||
| 53 | 53 | ||
| 54 | /* Insmod parameters */ | 54 | /* Insmod parameters */ |
| 55 | I2C_CLIENT_INSMOD_1(asb100); | 55 | I2C_CLIENT_INSMOD_1(asb100); |
| 56 | I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: " | 56 | |
| 57 | static unsigned short force_subclients[4]; | ||
| 58 | module_param_array(force_subclients, short, NULL, 0); | ||
| 59 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | ||
| 57 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 60 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); |
| 58 | 61 | ||
| 59 | /* Voltage IN registers 0-6 */ | 62 | /* Voltage IN registers 0-6 */ |