diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 14:59:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 14:59:14 -0700 |
commit | 663cc813a8da4dcc35043998c8856e6ff2ee48fd (patch) | |
tree | 97e62a1250f4c64cb75455aa9796c5306bf996e1 /drivers/staging | |
parent | 58e57fbd1c7e8833314459555e337364fe5521f3 (diff) | |
parent | 6f6b35e133fe4313277b30fc1a7ea313875ea6c9 (diff) | |
download | linux-663cc813a8da4dcc35043998c8856e6ff2ee48fd.tar.bz2 |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
macintosh: Don't assume i2c device probing always succeeds
i2c: Hide probe errors caused by ACPI resource conflicts
i2c: Minor documentation update
mfd: AB3100 drop unused module parameters
Staging: IIO: tsl2561: Drop unused module parameters
leds: leds-pca9532 - Drop unused module parameters
ltc4215/ltc4245: Discard obsolete detect methods
ds2482: Discard obsolete detect method
max6875: Discard obsolete detect method
i2c: Move misc devices documentation
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/iio/light/tsl2561.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/iio/light/tsl2561.c b/drivers/staging/iio/light/tsl2561.c index ea8a5efc19bc..fc2107f4c049 100644 --- a/drivers/staging/iio/light/tsl2561.c +++ b/drivers/staging/iio/light/tsl2561.c @@ -239,10 +239,6 @@ static int __devexit tsl2561_remove(struct i2c_client *client) return tsl2561_powerdown(client); } -static unsigned short normal_i2c[] = { 0x29, 0x39, 0x49, I2C_CLIENT_END }; - -I2C_CLIENT_INSMOD; - static const struct i2c_device_id tsl2561_id[] = { { "tsl2561", 0 }, { } |