More compile fixes to allow a flawless static build, changed the

READMEs accordingly, compile fixes for the mxb driver.

1 files changed, 21 insertions, 6 deletions

diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c
index d69049a7b..a6f4cb06f 100644
--- a/linux/drivers/media/common/saa7146_vbi.c
+++ b/linux/drivers/media/common/saa7146_vbi.c
@@ -5,6 +5,7 @@
 
 static int vbi_pixel_to_capture = 720 * 2;
 
+static
 int vbi_workaround(struct saa7146_dev *dev)
 {
         u32          *cpu;
@@ -194,7 +195,8 @@ void saa7146_set_vbi_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, s
 	saa7146_write(dev, MC1, (MASK_13 | MASK_29));	
 }
 
-static int buffer_activate(struct saa7146_dev *dev,
+static
+int buffer_activate(struct saa7146_dev *dev,
 			   struct saa7146_buf *buf,
 			   struct saa7146_buf *next)
 {
@@ -207,7 +209,8 @@ static int buffer_activate(struct saa7146_dev *dev,
 	return 0;
 }
 
-static int buffer_prepare(struct file *file, struct videobuf_buffer *vb)
+static
+int buffer_prepare(struct file *file, struct videobuf_buffer *vb)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -254,12 +257,14 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb)
 
 	return err;
 }
+
 static int
 buffer_setup(struct file *file, int *count, int *size)
 {
+/*
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
-
+*/
 	int llength,lines;
 	
 	lines   = 16 * 2 ; /* 2 fields */
@@ -273,7 +278,8 @@ buffer_setup(struct file *file, int *count, int *size)
 	return 0;
 }
 
-static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
+static
+void buffer_queue(struct file *file, struct videobuf_buffer *vb)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -283,7 +289,8 @@ static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
 	saa7146_buffer_queue(dev,&dev->vbi_q,buf);
 }
 
-static void buffer_release(struct file *file, struct videobuf_buffer *vb)
+static
+void buffer_release(struct file *file, struct videobuf_buffer *vb)
 {
 	struct saa7146_fh *fh   = file->private_data;
 	struct saa7146_dev *dev = fh->dev;
@@ -293,6 +300,7 @@ static void buffer_release(struct file *file, struct videobuf_buffer *vb)
 	saa7146_dma_free(dev,buf);
 }
 
+static
 struct videobuf_queue_ops vbi_qops = {
 	.buf_setup    = buffer_setup,
 	.buf_prepare  = buffer_prepare,
@@ -302,6 +310,7 @@ struct videobuf_queue_ops vbi_qops = {
 
 /* ------------------------------------------------------------------ */
 
+static
 void vbi_stop(struct saa7146_fh *fh)
 {
 	struct saa7146_dev *dev = fh->dev;
@@ -323,6 +332,7 @@ void vbi_stop(struct saa7146_fh *fh)
 	spin_unlock_irqrestore(&dev->slock, flags);
 }
 
+static
 void vbi_read_timeout(unsigned long data)
 {
 	struct saa7146_fh *fh = (struct saa7146_fh *)data;
@@ -333,6 +343,7 @@ void vbi_read_timeout(unsigned long data)
 	vbi_stop(fh);
 }
 
+static
 void vbi_init(struct saa7146_dev *dev)
 {
 	INIT_LIST_HEAD(&dev->vbi_q.queue);
@@ -345,6 +356,7 @@ void vbi_init(struct saa7146_dev *dev)
 	init_waitqueue_head(&dev->vbi_wq);
 }
 
+static
 void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
 {
 	memset(&fh->vbi_fmt,0,sizeof(fh->vbi_fmt));
@@ -373,6 +385,7 @@ void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
 	vbi_workaround(dev);
 }
 
+static
 void vbi_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
 {
 	if( fh == dev->vbi_streaming ) {
@@ -380,6 +393,7 @@ void vbi_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file
 	}
 }
 
+static
 void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
 {
 	spin_lock(&dev->slock);
@@ -398,7 +412,8 @@ void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
 	spin_unlock(&dev->slock);
 }
 
-static ssize_t vbi_read(struct file *file, char *data, size_t count, loff_t *ppos)
+static
+ssize_t vbi_read(struct file *file, char *data, size_t count, loff_t *ppos)
 {
 	struct saa7146_fh *fh = file->private_data;
 	struct saa7146_dev *dev = fh->dev;