Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=047646bfbbe5ec961d2430514ae29fa0b87ab651
Commit: 047646bfbbe5ec961d2430514ae29fa0b87ab651
Parent: fe475163ff9680495af3b1b5b7633ea7a42e4185
Author: Steven Toth <[EMAIL PROTECTED]>
AuthorDate: Tue Mar 20 15:33:53 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:08:09 2007 -0300
V4L/DVB (6159): General code cleanup
Removed if 0'd code, removed cx88 references.
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/cx23885/cx23885-core.c | 6 +++---
drivers/media/video/cx23885/cx23885.h | 10 +---------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/media/video/cx23885/cx23885-core.c
b/drivers/media/video/cx23885/cx23885-core.c
index d8e376d..804ba7f 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/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/drivers/media/video/cx23885/cx23885.h
b/drivers/media/video/cx23885/cx23885.h
index 4e1fc68..b60de21 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
