diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/media/ovcamchip.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/media/ovcamchip.h')
| -rw-r--r-- | include/media/ovcamchip.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/media/ovcamchip.h b/include/media/ovcamchip.h index cb7c0aa96f22..8138983adced 100644 --- a/include/media/ovcamchip.h +++ b/include/media/ovcamchip.h | |||
| @@ -17,20 +17,6 @@ | |||
| 17 | #include <linux/videodev.h> | 17 | #include <linux/videodev.h> |
| 18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
| 19 | 19 | ||
| 20 | /* Remove these once they are officially defined */ | ||
| 21 | #ifndef I2C_DRIVERID_OVCAMCHIP | ||
| 22 | #define I2C_DRIVERID_OVCAMCHIP 0xf00f | ||
| 23 | #endif | ||
| 24 | #ifndef I2C_HW_SMBUS_OV511 | ||
| 25 | #define I2C_HW_SMBUS_OV511 0xfe | ||
| 26 | #endif | ||
| 27 | #ifndef I2C_HW_SMBUS_OV518 | ||
| 28 | #define I2C_HW_SMBUS_OV518 0xff | ||
| 29 | #endif | ||
| 30 | #ifndef I2C_HW_SMBUS_OVFX2 | ||
| 31 | #define I2C_HW_SMBUS_OVFX2 0xfd | ||
| 32 | #endif | ||
| 33 | |||
| 34 | /* --------------------------------- */ | 20 | /* --------------------------------- */ |
| 35 | /* ENUMERATIONS */ | 21 | /* ENUMERATIONS */ |
| 36 | /* --------------------------------- */ | 22 | /* --------------------------------- */ |