From 6224375926aa33fe05c1daaa9d2ff3be82378a0c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 29 Dec 2008 23:44:20 -0300
Subject: [PATCH] --- yaml --- r: 124579 b: refs/heads/master c:
 60b4bde48b36c0315ef41fd38c339b9c7e68c46f h: refs/heads/master i:   124577:
 63c25aa4efe8c2fb6ba1857deb3099e88267e1df   124575:
 39f749b5ab9460edcfa9299df784ba4d2bf26877 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/zoran/zoran_card.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 44b81447d5b0..d3d15ec964ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d543096ee743faa52d69506eef73d3cb6208f18
+refs/heads/master: 60b4bde48b36c0315ef41fd38c339b9c7e68c46f
diff --git a/trunk/drivers/media/video/zoran/zoran_card.c b/trunk/drivers/media/video/zoran/zoran_card.c
index fa5f2f8f518a..05f39195372e 100644
--- a/trunk/drivers/media/video/zoran/zoran_card.c
+++ b/trunk/drivers/media/video/zoran/zoran_card.c
@@ -153,12 +153,6 @@ MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver");
 MODULE_AUTHOR("Serguei Miridonov");
 MODULE_LICENSE("GPL");
 
-static struct pci_device_id zr36067_pci_tbl[] = {
-	{PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36057,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{0}
-};
-MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl);
 
 int zoran_num;			/* number of Buzs in use */
 struct zoran *zoran[BUZ_MAX];