6 files changed, 7 insertions, 11 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index ecc32b6fb..85c8897be 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-blackbird.c,v 1.21 2004/12/02 14:23:54 kraxel Exp $
+ * $Id: cx88-blackbird.c,v 1.22 2004/12/07 13:17:57 kraxel Exp $
  *
  *  Support for a cx23416 mpeg encoder via cx2388x host port.
  *  "blackbird" reference design.
@@ -723,7 +723,7 @@ static int mpeg_release(struct inode *inode, struct file *file)
 }
 
 static ssize_t
-mpeg_read(struct file *file, char *data, size_t count, loff_t *ppos)
+mpeg_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 {
 	struct cx8802_fh *fh = file->private_data;
 
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 4a177e056..e12b480f0 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-core.c,v 1.19 2004/12/02 13:44:44 kraxel Exp $
+ * $Id: cx88-core.c,v 1.20 2004/12/07 13:17:57 kraxel Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * driver core
@@ -1102,9 +1102,6 @@ static int get_ressources(struct cx88_core *core, struct pci_dev *pci)
 	return -EBUSY;
 }
 
-//static int cx88_ir_attach(struct cx88_core *core, struct pci_dev *pci_dev);
-//static int cx88_ir_detach(struct cx88_core *core);
-
 struct cx88_core* cx88_core_get(struct pci_dev *pci)
 {
 	struct cx88_core *core;
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index c3a29aa76..6643f69c2 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.44 2004/12/02 13:44:44 kraxel Exp $
+ * $Id: cx88.h,v 1.45 2004/12/07 13:17:57 kraxel Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -227,8 +227,6 @@ struct cx88_dmaqueue {
 	u32                    count;
 };
 
-struct cx88_IR; /* Private structure in cx88-ir-kbd-gpio.c */
-
 struct cx88_core {
 	struct list_head           devlist;
 	atomic_t                   refcount;
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 03f2404a5..224a0f791 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1429,7 +1429,7 @@ static struct i2c_driver driver = {
         .attach_adapter = msp_probe,
         .detach_client  = msp_detach,
         .command        = msp_command,
-	.driver {
+	.driver = {
 		.suspend = msp_suspend,
 		.resume  = msp_resume,
 	},
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 03f2404a5..224a0f791 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1429,7 +1429,7 @@ static struct i2c_driver driver = {
         .attach_adapter = msp_probe,
         .detach_client  = msp_detach,
         .command        = msp_command,
-	.driver {
+	.driver = {
 		.suspend = msp_suspend,
 		.resume  = msp_resume,
 	},
diff --git a/v4l/.bp/2.6/cx88-update b/v4l/.bp/2.6/cx88-update
index ce591978d..0325bc724 100644
--- a/v4l/.bp/2.6/cx88-update
+++ b/v4l/.bp/2.6/cx88-update
@@ -7,6 +7,7 @@ srcdiff cx88-i2c.c		drivers/media/video/cx88/cx88-i2c.c
 srcdiff cx88-tvaudio.c		drivers/media/video/cx88/cx88-tvaudio.c
 srcdiff cx88-video.c		drivers/media/video/cx88/cx88-video.c
 srcdiff cx88-vbi.c		drivers/media/video/cx88/cx88-vbi.c
+srcdiff cx88-input.c		drivers/media/video/cx88/cx88-input.c
 
 srcdiff cx88-mpeg.c		drivers/media/video/cx88/cx88-mpeg.c
 srcdiff cx88-dvb.c		drivers/media/video/cx88/cx88-dvb.c