diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/media/video/mt9m001.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
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() */ |