diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-30 17:50:02 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-30 17:50:02 +0000 |
| commit | 94887abe60f42f71c327a2fa9e27162621b7cde1 (patch) | |
| tree | 583183c7e9e3bc9c5e231c11cd07937954829fe6 | |
| parent | 2affae49d520773e78b7b15f4b6217f147751226 (diff) | |
| download | mediapointer-dvb-s2-94887abe60f42f71c327a2fa9e27162621b7cde1.tar.gz mediapointer-dvb-s2-94887abe60f42f71c327a2fa9e27162621b7cde1.tar.bz2 | |
- i2c-id.h Updated to reflect the newer drivers.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/include/linux/i2c-id.h | 7 | ||||
| -rw-r--r-- | linux/include/media/id.h | 21 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 |
3 files changed, 18 insertions, 22 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index 57f0d67d2..afe0533e9 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -102,7 +102,11 @@ #define I2C_DRIVERID_TDA9874 66 /* TV sound decoder */ #define I2C_DRIVERID_SAA6752HS 67 /* MPEG2 encoder */ #define I2C_DRIVERID_TVEEPROM 68 /* TV EEPROM */ - +#define I2C_DRIVERID_WM8775 69 /* wm8775 audio processor */ +#define I2C_DRIVERID_CS53L32A 70 /* cs53l32a audio processor */ +#define I2C_DRIVERID_CX25840 71 /* cx2584x video encoder */ +#define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ +#define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ #define I2C_DRIVERID_EXP1 0xF1 @@ -196,6 +200,7 @@ #define I2C_HW_B_NVIDIA 0x01001c /* nvidia framebuffer driver */ #define I2C_HW_B_SAVAGE 0x01001d /* savage framebuffer driver */ #define I2C_HW_B_RADEON 0x01001e /* radeon framebuffer driver */ +#define I2C_HW_B_EM28XX 0x01001f /* em28xx video capture cards */ /* --- PCF 8584 based algorithms */ #define I2C_HW_P_LP 0x020000 /* Parallel port interface */ diff --git a/linux/include/media/id.h b/linux/include/media/id.h deleted file mode 100644 index 6718ac639..000000000 --- a/linux/include/media/id.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * $Id: id.h,v 1.7 2005/10/30 17:19:21 mchehab Exp $ - */ - -/* FIXME: this temporarely, until these are included in linux/i2c-id.h */ - -#ifndef I2C_DRIVERID_WM8775 -#define I2C_DRIVERID_WM8775 I2C_DRIVERID_EXP0+9 -#endif -#ifndef I2C_DRIVERID_CS53L32A -#define I2C_DRIVERID_CS53L32A I2C_DRIVERID_EXP0+10 -#endif -#ifndef I2C_DRIVERID_CX25840 -#define I2C_DRIVERID_CX25840 I2C_DRIVERID_EXP0+11 -#endif -#ifndef I2C_DRIVERID_SAA7115 -#define I2C_DRIVERID_SAA7115 I2C_DRIVERID_EXP0+12 -#endif -#ifndef I2C_DRIVERID_SAA7127 -#define I2C_DRIVERID_SAA7127 I2C_DRIVERID_EXP0+13 -#endif diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ef232050a..dfa11de00 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-10-30 17:42 mchehab + + * ../linux/include/linux/i2c-id.h: + - Updated to reflect the newer drivers. + + * ../linux/include/media/id.h: + - Removed since codes should be at i2c-id.h + - saa7115 not migrated since should be merged with + newer saa711x code. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-10-30 17:35 mchehab * ../linux/drivers/media/video/em28xx/em28xx-cards.c: |