diff options
author | Ladislav Michl <ladis@linux-mips.org> | 2005-09-23 06:52:27 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:27 -0400 |
commit | 495515b351957e4f6155d1696132f53acc4d06e5 (patch) | |
tree | ce7fe8c50f7578d147d10b811497f3a246e917cd /drivers/media/video/indycam.c | |
parent | 80b47346b0c83edab5d183376b41e9968bd5ac32 (diff) |
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 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/module.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
15 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
16 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
15 | #include <linux/init.h> | ||
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/major.h> | 17 | #include <linux/major.h> |
19 | #include <linux/slab.h> | 18 | #include <linux/module.h> |
20 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
21 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/slab.h> | ||
22 | 22 | ||
23 | #include <linux/videodev.h> | 23 | #include <linux/videodev.h> |
24 | /* IndyCam decodes stream of photons into digital image representation ;-) */ | 24 | /* IndyCam decodes stream of photons into digital image representation ;-) */ |
@@ -44,8 +44,6 @@ MODULE_LICENSE("GPL"); | |||
44 | #define indycam_regdump(client) | 44 | #define indycam_regdump(client) |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #define VINO_ADAPTER (I2C_ALGO_SGI | I2C_HW_SGI_VINO) | ||
48 | |||
49 | struct indycam { | 47 | struct indycam { |
50 | struct i2c_client *client; | 48 | struct i2c_client *client; |
51 | int version; | 49 | int version; |
@@ -300,7 +298,7 @@ out_free_client: | |||
300 | static int indycam_probe(struct i2c_adapter *adap) | 298 | static int indycam_probe(struct i2c_adapter *adap) |
301 | { | 299 | { |
302 | /* Indy specific crap */ | 300 | /* Indy specific crap */ |
303 | if (adap->id == VINO_ADAPTER) | 301 | if (adap->id == I2C_HW_SGI_VINO) |
304 | return indycam_attach(adap, INDYCAM_ADDR, 0); | 302 | return indycam_attach(adap, INDYCAM_ADDR, 0); |
305 | /* Feel free to add probe here :-) */ | 303 | /* Feel free to add probe here :-) */ |
306 | return -ENODEV; | 304 | return -ENODEV; |