diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 12:50:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 12:50:05 -0500 |
| commit | 5907c5f8adbd0bb7ab69124520304e5b25c8eb5e (patch) | |
| tree | c3e1bc99f41c74b369293c74a1752e57e538f706 /include | |
| parent | 0a2c986557b964453f8deeaf56f6d88bf3e65e92 (diff) | |
| parent | eff245c82f115059648cdce95dd68bb940f2b006 (diff) | |
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:
i2c: Make i2cdev_notifier_call static
i2c: Delete ANY_I2C_BUS
i2c: Fix device name for 10-bit slave address
i2c-algo-bit: Generate correct i2c address sequence for 10-bit target
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index a81bf6d23b3e..07d103a06d64 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -432,9 +432,6 @@ void i2c_unlock_adapter(struct i2c_adapter *); | |||
| 432 | /* Internal numbers to terminate lists */ | 432 | /* Internal numbers to terminate lists */ |
| 433 | #define I2C_CLIENT_END 0xfffeU | 433 | #define I2C_CLIENT_END 0xfffeU |
| 434 | 434 | ||
| 435 | /* The numbers to use to set I2C bus address */ | ||
| 436 | #define ANY_I2C_BUS 0xffff | ||
| 437 | |||
| 438 | /* Construct an I2C_CLIENT_END-terminated array of i2c addresses */ | 435 | /* Construct an I2C_CLIENT_END-terminated array of i2c addresses */ |
| 439 | #define I2C_ADDRS(addr, addrs...) \ | 436 | #define I2C_ADDRS(addr, addrs...) \ |
| 440 | ((const unsigned short []){ addr, ## addrs, I2C_CLIENT_END }) | 437 | ((const unsigned short []){ addr, ## addrs, I2C_CLIENT_END }) |