diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 13:42:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 13:42:54 -0400 |
| commit | 4e93d3e8859c834ee18dfd33051d24df8669d0c0 (patch) | |
| tree | 13f5b39730857257b5040471618e9bcce30ed9cc /drivers/macintosh/therm_windtunnel.c | |
| parent | a0cd30fd26a398c0c6e50c6760610d4529f17a84 (diff) | |
| parent | 0087e5ef577d0d6e664be7ab4be513b6a482e7ec (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 0bdb47f08c2a..61400f04015e 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -51,8 +51,10 @@ | |||
| 51 | static int do_probe( struct i2c_adapter *adapter, int addr, int kind); | 51 | static int do_probe( struct i2c_adapter *adapter, int addr, int kind); |
| 52 | 52 | ||
| 53 | /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ | 53 | /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ |
| 54 | static unsigned short normal_i2c[] = { 0x49, 0x2c, I2C_CLIENT_END }; | 54 | static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, |
| 55 | static unsigned short normal_i2c_range[] = { 0x48, 0x4f, 0x2c, 0x2f, I2C_CLIENT_END }; | 55 | 0x4c, 0x4d, 0x4e, 0x4f, |
| 56 | 0x2c, 0x2d, 0x2e, 0x2f, | ||
| 57 | I2C_CLIENT_END }; | ||
| 56 | 58 | ||
| 57 | I2C_CLIENT_INSMOD; | 59 | I2C_CLIENT_INSMOD; |
| 58 | 60 | ||