diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/media | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/id.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/media/id.h b/include/media/id.h index a39a6423914b..801ddef301aa 100644 --- a/include/media/id.h +++ b/include/media/id.h | |||
| @@ -34,8 +34,3 @@ | |||
| 34 | #ifndef I2C_DRIVERID_SAA6752HS | 34 | #ifndef I2C_DRIVERID_SAA6752HS |
| 35 | # define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8 | 35 | # define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8 |
| 36 | #endif | 36 | #endif |
| 37 | |||
| 38 | /* algorithms */ | ||
| 39 | #ifndef I2C_ALGO_SAA7134 | ||
| 40 | # define I2C_ALGO_SAA7134 0x090000 | ||
| 41 | #endif | ||