diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
| commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
| tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /include/linux/i2c.h | |
| parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 4 |
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) | |||
| 393 | #define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */ | 393 | #define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */ |
| 394 | #define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */ | 394 | #define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */ |
| 395 | #define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */ | 395 | #define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */ |
| 396 | #define I2C_CLASS_CAM_ANALOG (1<<4) /* camera with analog CCD */ | ||
| 397 | #define I2C_CLASS_CAM_DIGITAL (1<<5) /* most webcams */ | ||
| 398 | #define I2C_CLASS_SOUND (1<<6) /* sound devices */ | ||
| 399 | #define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */ | 396 | #define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */ |
| 400 | #define I2C_CLASS_ALL (UINT_MAX) /* all of the above */ | ||
| 401 | 397 | ||
| 402 | /* i2c_client_address_data is the struct for holding default client | 398 | /* i2c_client_address_data is the struct for holding default client |
| 403 | * addresses for a driver and for the parameters supplied on the | 399 | * addresses for a driver and for the parameters supplied on the |