CVS Update@linux-mips.org: linux

[ladis@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ladis@ftp.linux-mips.org        05/09/23 11:52:27

Modified files:
        drivers/media/video: indycam.c saa7191.c vino.c 

Log message:
        Let it compile again after i2c algo id removal. Sort headers.

diff -urN linux/drivers/media/video/indycam.c 
linux/drivers/media/video/indycam.c
--- linux/drivers/media/video/indycam.c 2005/09/01 15:07:34     1.3
+++ linux/drivers/media/video/indycam.c 2005/09/23 10:52:27     1.4
@@ -9,16 +9,16 @@
  *  published by the Free Software Foundation.
  */
 
-#include <linux/module.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include <linux/videodev.h>
 /* IndyCam decodes stream of photons into digital image representation ;-) */
@@ -44,8 +44,6 @@
 #define indycam_regdump(client)
 #endif
 
-#define VINO_ADAPTER   (I2C_ALGO_SGI | I2C_HW_SGI_VINO)
-
 struct indycam {
        struct i2c_client *client;
        u8 version;
@@ -366,7 +364,7 @@
 static int indycam_probe(struct i2c_adapter *adap)
 {
        /* Indy specific crap */
-       if (adap->id == VINO_ADAPTER)
+       if (adap->id == I2C_HW_SGI_VINO)
                return indycam_attach(adap, INDYCAM_ADDR, 0);
        /* Feel free to add probe here :-) */
        return -ENODEV;
diff -urN linux/drivers/media/video/saa7191.c 
linux/drivers/media/video/saa7191.c
--- linux/drivers/media/video/saa7191.c 2005/09/01 15:07:34     1.3
+++ linux/drivers/media/video/saa7191.c 2005/09/23 10:52:27     1.4
@@ -9,16 +9,16 @@
  *  published by the Free Software Foundation.
  */
 
-#include <linux/module.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include <linux/videodev.h>
 #include <linux/video_decoder.h>
@@ -41,8 +41,6 @@
 #define dprintk(x...)
 #endif
 
-#define VINO_ADAPTER           (I2C_ALGO_SGI | I2C_HW_SGI_VINO)
-
 #define SAA7191_SYNC_COUNT     30
 #define SAA7191_SYNC_DELAY     100     /* milliseconds */
 
@@ -628,7 +626,7 @@
 static int saa7191_probe(struct i2c_adapter *adap)
 {
        /* Always connected to VINO */
-       if (adap->id == VINO_ADAPTER)
+       if (adap->id == I2C_HW_SGI_VINO)
                return saa7191_attach(adap, SAA7191_ADDR, 0);
        /* Feel free to add probe here :-) */
        return -ENODEV;
@@ -655,7 +653,7 @@
 
                cap->flags  = VIDEO_DECODER_PAL | VIDEO_DECODER_NTSC |
                              VIDEO_DECODER_SECAM | VIDEO_DECODER_AUTO;
-               cap->inputs = (client->adapter->id == VINO_ADAPTER) ? 2 : 1;
+               cap->inputs = (client->adapter->id == I2C_HW_SGI_VINO) ? 2 : 1;
                cap->outputs = 1;
                break;
        }
@@ -713,7 +711,7 @@
                int *iarg = arg;
 
                switch (client->adapter->id) {
-               case VINO_ADAPTER:
+               case I2C_HW_SGI_VINO:
                        return saa7191_set_input(client, *iarg);
                default:
                        if (*iarg != 0)
diff -urN linux/drivers/media/video/vino.c linux/drivers/media/video/vino.c
--- linux/drivers/media/video/vino.c    2005/09/01 15:07:34     1.10
+++ linux/drivers/media/video/vino.c    2005/09/23 10:52:27     1.11
@@ -22,14 +22,15 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
-#include <linux/time.h>
 #include <linux/moduleparam.h>
+#include <linux/time.h>
+#include <linux/version.h>
 
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>