diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /drivers/hwmon/adm1031.c | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/hwmon/adm1031.c')
| -rw-r--r-- | drivers/hwmon/adm1031.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c index 5aaad3636c98..2bffcab7dc9f 100644 --- a/drivers/hwmon/adm1031.c +++ b/drivers/hwmon/adm1031.c | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | #define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan)) | 61 | #define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan)) |
| 62 | 62 | ||
| 63 | /* Addresses to scan */ | 63 | /* Addresses to scan */ |
| 64 | static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; | 64 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; |
| 65 | 65 | ||
| 66 | /* Insmod parameters */ | 66 | /* Insmod parameters */ |
| 67 | I2C_CLIENT_INSMOD_2(adm1030, adm1031); | 67 | I2C_CLIENT_INSMOD_2(adm1030, adm1031); |