diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/media/video/mt9m001.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/media/video/mt9m001.c')
| -rw-r--r-- | drivers/media/video/mt9m001.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index 179e47049a45..ee43499544c1 100644 --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c | |||
| @@ -12,15 +12,12 @@ | |||
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/log2.h> | 14 | #include <linux/log2.h> |
| 15 | #include <linux/gpio.h> | ||
| 15 | 16 | ||
| 16 | #include <media/v4l2-common.h> | 17 | #include <media/v4l2-common.h> |
| 17 | #include <media/v4l2-chip-ident.h> | 18 | #include <media/v4l2-chip-ident.h> |
| 18 | #include <media/soc_camera.h> | 19 | #include <media/soc_camera.h> |
| 19 | 20 | ||
| 20 | #ifdef CONFIG_MT9M001_PCA9536_SWITCH | ||
| 21 | #include <asm/gpio.h> | ||
| 22 | #endif | ||
| 23 | |||
| 24 | /* mt9m001 i2c address 0x5d | 21 | /* mt9m001 i2c address 0x5d |
| 25 | * The platform has to define i2c_board_info | 22 | * The platform has to define i2c_board_info |
| 26 | * and call i2c_register_board_info() */ | 23 | * and call i2c_register_board_info() */ |