---

yaml --- r: 65849 b: refs/heads/master c: 047646b h: refs/heads/master i: 65847: 1bf338d v: v3
git-mirror · Oct 10, 2007 · 57a9251 · 57a9251
1 parent 94ee3bf
commit 57a9251
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe475163ff9680495af3b1b5b7633ea7a42e4185
+refs/heads/master: 047646bfbbe5ec961d2430514ae29fa0b87ab651
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -1498,9 +1498,9 @@ static struct pci_driver cx23885_pci_driver = {
 static int cx23885_init(void)
 {
 	printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n",
-	       (CX88_VERSION_CODE >> 16) & 0xff,
-	       (CX88_VERSION_CODE >>  8) & 0xff,
-	       CX88_VERSION_CODE & 0xff);
+	       (CX23885_VERSION_CODE >> 16) & 0xff,
+	       (CX23885_VERSION_CODE >>  8) & 0xff,
+	       CX23885_VERSION_CODE & 0xff);
 #ifdef SNAPSHOT
 	printk(KERN_INFO "cx23885: snapshot date %04d-%02d-%02d\n",
 	       SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);

diff --git a/trunk/drivers/media/video/cx23885/cx23885.h b/trunk/drivers/media/video/cx23885/cx23885.h
@@ -38,7 +38,7 @@
 #include <linux/version.h>
 #include <linux/mutex.h>
 
-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)
+#define CX23885_VERSION_CODE KERNEL_VERSION(0,0,1)
 
 #define UNSET (-1U)
 
@@ -69,14 +69,6 @@ enum cx23885_itype {
 	CX23885_RADIO,
 };
 
-struct cx23885_fmt {
-	char  *name;
-	u32   fourcc;          /* v4l2 format id */
-	int   depth;
-	int   flags;
-	u32   cxformat;
-};
-
 /* buffer for one video frame */
 struct cx23885_buffer {
 	/* common v4l buffer stuff -- must be first */