From 4e5e3ab290f3a83196af24f600f666bf48b87753 Mon Sep 17 00:00:00 2001
From: Peter De Schrijver <p2@psychaos.be>
Date: Sun, 6 Nov 2011 10:47:58 -0300
Subject: [PATCH] --- yaml --- r: 285185 b: refs/heads/master c:
 c540d9f13d1f0f6913434b0b8241bb6270818769 h: refs/heads/master i:   285183:
 72c95682c71bc90a00800bb426018585271e697b v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/bt8xx/bt848.h       | 5 ++++-
 trunk/drivers/media/video/bt8xx/bttv-driver.c | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7ecee6c98aa3..9953f9a1a5ce 100644
--- 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
index 0bcd95303bb0..c37e6acffded 100644
--- a/trunk/drivers/media/video/bt8xx/bt848.h
+++ b/trunk/drivers/media/video/bt8xx/bt848.h
@@ -30,6 +30,10 @@
 #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
@@ -37,7 +41,6 @@
 #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
index 3dd06607aec2..76c301f05095 100644
--- 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,}
 };