---

yaml --- r: 285185 b: refs/heads/master c: c540d9f h: refs/heads/master i: 285183: 72c9568 v: v3
git-mirror · Nov 8, 2011 · 4e5e3ab · 4e5e3ab
1 parent e25dbee
commit 4e5e3ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de2843b663fd621e9a6c75fed4da73e8c9a1b094
+refs/heads/master: c540d9f13d1f0f6913434b0b8241bb6270818769
diff --git a/trunk/drivers/media/video/bt8xx/bt848.h b/trunk/drivers/media/video/bt8xx/bt848.h
@@ -30,14 +30,17 @@
 #ifndef PCI_DEVICE_ID_BT849
 #define PCI_DEVICE_ID_BT849     0x351
 #endif
+#ifndef PCI_DEVICE_ID_FUSION879
+#define PCI_DEVICE_ID_FUSION879	0x36c
+#endif
+
 #ifndef PCI_DEVICE_ID_BT878
 #define PCI_DEVICE_ID_BT878     0x36e
 #endif
 #ifndef PCI_DEVICE_ID_BT879
 #define PCI_DEVICE_ID_BT879     0x36f
 #endif
 
-
 /* Brooktree 848 registers */
 
 #define BT848_DSTATUS          0x000

diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c
@@ -4572,6 +4572,7 @@ static struct pci_device_id bttv_pci_tbl[] = {
 	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0},
 	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0},
 	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0},
+	{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_FUSION879), 0},
 	{0,}
 };