diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2005-09-23 14:52:27 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 22:32:27 +0400 |
| commit | 495515b351957e4f6155d1696132f53acc4d06e5 (patch) | |
| tree | ce7fe8c50f7578d147d10b811497f3a246e917cd /drivers/media/video/indycam.c | |
| parent | 80b47346b0c83edab5d183376b41e9968bd5ac32 (diff) | |
| download | linux-495515b351957e4f6155d1696132f53acc4d06e5.tar.xz | |
Let it compile again after i2c algo id removal. Sort headers.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/media/video/indycam.c')
| -rw-r--r-- | drivers/media/video/indycam.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c index b2b0384cd4b9..26dd06ec89a2 100644 --- a/drivers/media/video/indycam.c +++ b/drivers/media/video/indycam.c @@ -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 @@ MODULE_LICENSE("GPL"); #define indycam_regdump(client) #endif -#define VINO_ADAPTER (I2C_ALGO_SGI | I2C_HW_SGI_VINO) - struct indycam { struct i2c_client *client; int version; @@ -300,7 +298,7 @@ out_free_client: 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; |