diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-01 05:20:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-01 05:20:48 -0400 |
| commit | 0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6 (patch) | |
| tree | f0714ddcd02812b4fbe3b5405df9e4068f5587e2 /include/linux/i2c-id.h | |
| parent | 925936ebf35a95c290e010b784c962164e6728f3 (diff) | |
| parent | 33974093c024f08caadd2fc71a83bd811ed1831d (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up latest fixes and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/i2c-id.h')
| -rw-r--r-- | include/linux/i2c-id.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index c9087de5c6c6..e844a0b18695 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
| @@ -28,17 +28,6 @@ | |||
| 28 | identify a legacy client. If you don't need them, just don't set them. */ | 28 | identify a legacy client. If you don't need them, just don't set them. */ |
| 29 | 29 | ||
| 30 | /* | 30 | /* |
| 31 | * ---- Driver types ----------------------------------------------------- | ||
| 32 | */ | ||
| 33 | |||
| 34 | #define I2C_DRIVERID_MSP3400 1 | ||
| 35 | #define I2C_DRIVERID_TUNER 2 | ||
| 36 | #define I2C_DRIVERID_TDA7432 27 /* Stereo sound processor */ | ||
| 37 | #define I2C_DRIVERID_TVAUDIO 29 /* Generic TV sound driver */ | ||
| 38 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ | ||
| 39 | #define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */ | ||
| 40 | |||
| 41 | /* | ||
| 42 | * ---- Adapter types ---------------------------------------------------- | 31 | * ---- Adapter types ---------------------------------------------------- |
| 43 | */ | 32 | */ |
| 44 | 33 | ||