diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-11 09:48:49 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-11 09:48:49 -0200 |
| commit | 4a70d3c9aaca6298bc729cb64a25014b0e91646b (patch) | |
| tree | 189e72a70aaddf56a199a23c906fe6c913236fe8 | |
| parent | 90c4407a4023f4e54f115280d745512e8419ddf4 (diff) | |
| download | mediapointer-dvb-s2-4a70d3c9aaca6298bc729cb64a25014b0e91646b.tar.gz mediapointer-dvb-s2-4a70d3c9aaca6298bc729cb64a25014b0e91646b.tar.bz2 | |
Sync bt87x and i2c-id files
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Those files are maintained by alsa and i2c teams. Sync their changes
into v4l/dvb tree.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | linux/sound/pci/bt87x.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index d38778f2f..6e7ec4c76 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -115,6 +115,8 @@ #define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ #define I2C_DRIVERID_ISL1208 88 /* Intersil ISL1208 RTC */ +#define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ +#define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index d90232a1f..69888fdcb 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -842,7 +842,6 @@ static struct { {0x1822, 0x0001}, /* Twinhan VisionPlus DVB-T */ {0x18ac, 0xd500}, /* DVICO FusionHDTV 5 Lite */ {0x18ac, 0xdb10}, /* DVICO FusionHDTV DVB-T Lite */ - {0x18ac, 0xdb11}, /* Ultraview DVB-T Lite */ {0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */ {0x7063, 0x2000}, /* pcHDTV HD-2000 TV */ }; |