Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-omap-h63xx.git] / drivers / media / video / mt9v022.c

diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index d1391ac550963b14ebeb2e52e9470c5215501bfd..56808cd2f8a96ac1079db1dbb2d33782194feaf9 100644 (file)
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -13,22 +13,19 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/gpio.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include <asm/gpio.h>
-#endif
-
 /* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
  * The platform has to define i2c_board_info
  * and call i2c_register_board_info() */
 
 static char *sensor_type;
 module_param(sensor_type, charp, S_IRUGO);
-MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"\n");
+MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");
 
 /* mt9v022 selected register addresses */
 #define MT9V022_CHIP_VERSION           0x00
@@ -91,7 +88,7 @@ static const struct soc_camera_data_format mt9v022_monochrome_formats[] = {
 struct mt9v022 {
        struct i2c_client *client;
        struct soc_camera_device icd;
-       int model;      /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
+       int model;      /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
        int switch_gpio;
        u16 chip_control;
        unsigned char datawidth;
@@ -818,7 +815,6 @@ static int mt9v022_remove(struct i2c_client *client)
 
        return 0;
 }
-
 static const struct i2c_device_id mt9v022_id[] = {
        { "mt9v022", 0 },
        { }