summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 09:50:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 09:50:05 -0800
commit5907c5f8adbd0bb7ab69124520304e5b25c8eb5e (patch)
treec3e1bc99f41c74b369293c74a1752e57e538f706 /include/linux
parent0a2c986557b964453f8deeaf56f6d88bf3e65e92 (diff)
parenteff245c82f115059648cdce95dd68bb940f2b006 (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/linux')
-rw-r--r--include/linux/i2c.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index a81bf6d23b3..07d103a06d6 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -432,9 +432,6 @@ void i2c_unlock_adapter(struct i2c_adapter *);
/* Internal numbers to terminate lists */
#define I2C_CLIENT_END 0xfffeU
-/* The numbers to use to set I2C bus address */
-#define ANY_I2C_BUS 0xffff
-
/* Construct an I2C_CLIENT_END-terminated array of i2c addresses */
#define I2C_ADDRS(addr, addrs...) \
((const unsigned short []){ addr, ## addrs, I2C_CLIENT_END })