summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-01-06 12:08:35 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-01-06 12:08:35 +1100
commit66761dc5bc9f2954b4fd8b11ce479143a351a49c (patch)
treec25cf6761b11c83baaf28a0591f02baa929cf1f6 /include/linux
parent931b24d320a05acd05d208d319873a857f2010ad (diff)
parentfe9ae364c851becfeef4a0475d7db0f496d1df9a (diff)
Merge branch 'quilt/i2c'
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 33a5992d4936..20873d402467 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -393,11 +393,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
#define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */
#define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */
#define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */
-#define I2C_CLASS_CAM_ANALOG (1<<4) /* camera with analog CCD */
-#define I2C_CLASS_CAM_DIGITAL (1<<5) /* most webcams */
-#define I2C_CLASS_SOUND (1<<6) /* sound devices */
#define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */
-#define I2C_CLASS_ALL (UINT_MAX) /* all of the above */
/* i2c_client_address_data is the struct for holding default client
* addresses for a driver and for the parameters supplied on the