diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 10:15:34 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 10:15:34 -0200 |
| commit | afcfb73bdbe21ae90b41a3adc127b65854b294df (patch) | |
| tree | 8707d887e65189779c379232a1ada45f8c6839c7 | |
| parent | f1e940da2ce33a9b48e62632c7f838b298097609 (diff) | |
| download | mediapointer-dvb-s2-afcfb73bdbe21ae90b41a3adc127b65854b294df.tar.gz mediapointer-dvb-s2-afcfb73bdbe21ae90b41a3adc127b65854b294df.tar.bz2 | |
Kernel Sync stuff
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Added a new format at videodev2.h
Added support for a new board at snd-bt87x module
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/include/linux/videodev2.h | 1 | ||||
| -rw-r--r-- | linux/sound/pci/bt87x.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 0fe3901c6..1b76d3e9a 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -356,6 +356,7 @@ struct v4l2_pix_format #define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ #define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ #define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ +#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */ /* * F O R M A T E N U M E R A T I O N diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index e4e99e429..65f7b6a4f 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -781,6 +781,8 @@ static struct pci_device_id snd_bt87x_ids[] = { BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, 32000), /* Viewcast Osprey 200 */ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100), + /* AVerMedia Studio No. 103, 203, ...? */ + BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, 48000), { } }; MODULE_DEVICE_TABLE(pci, snd_bt87x_ids); @@ -808,7 +810,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) const struct pci_device_id *supported; supported = pci_match_device(&driver, pci); - if (supported) + if (supported && supported->driver_data > 0) return supported->driver_data; for (i = 0; i < ARRAY_SIZE(blacklist); ++i) |