diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 14:30:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 14:30:37 -0700 |
| commit | f62378fcfc9c13a57b0b69dbd43336a4df8155a5 (patch) | |
| tree | b2682850f0d15079e0618ee09a23ba7ee71df55b /drivers | |
| parent | a418500b42c5c54f3f9d68036950c701740a2765 (diff) | |
| parent | 6a1ced59b3ac5d1088f597fd0613a724cdf19e2c (diff) | |
| download | kernel_samsung_crespo-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.zip kernel_samsung_crespo-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.tar.gz kernel_samsung_crespo-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acorn/char/pcf8583.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c index 141b4c2..2b850e5 100644 --- a/drivers/acorn/char/pcf8583.c +++ b/drivers/acorn/char/pcf8583.c @@ -23,12 +23,13 @@ static struct i2c_driver pcf8583_driver; static unsigned short ignore[] = { I2C_CLIENT_END }; static unsigned short normal_addr[] = { 0x50, I2C_CLIENT_END }; +static unsigned short *forces[] = { NULL }; static struct i2c_client_address_data addr_data = { .normal_i2c = normal_addr, .probe = ignore, .ignore = ignore, - .force = ignore, + .forces = forces, }; #define DAT(x) ((unsigned int)(x->dev.driver_data)) |