diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard-marxbot.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard-smartbot.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/ezx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pcm990-baseboard.c | 2 |
7 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 86e86c1300d5..2ff3f661a48e 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -311,7 +311,6 @@ static struct soc_camera_link iclink_mt9v022 = { | |||
311 | .bus_id = 0, /* Must match with the camera ID */ | 311 | .bus_id = 0, /* Must match with the camera ID */ |
312 | .board_info = &pcm037_i2c_camera[1], | 312 | .board_info = &pcm037_i2c_camera[1], |
313 | .i2c_adapter_id = 2, | 313 | .i2c_adapter_id = 2, |
314 | .module_name = "mt9v022", | ||
315 | }; | 314 | }; |
316 | 315 | ||
317 | static struct soc_camera_link iclink_mt9t031 = { | 316 | static struct soc_camera_link iclink_mt9t031 = { |
@@ -319,7 +318,6 @@ static struct soc_camera_link iclink_mt9t031 = { | |||
319 | .power = pcm037_camera_power, | 318 | .power = pcm037_camera_power, |
320 | .board_info = &pcm037_i2c_camera[0], | 319 | .board_info = &pcm037_i2c_camera[0], |
321 | .i2c_adapter_id = 2, | 320 | .i2c_adapter_id = 2, |
322 | .module_name = "mt9t031", | ||
323 | }; | 321 | }; |
324 | 322 | ||
325 | static struct i2c_board_info pcm037_i2c_devices[] = { | 323 | static struct i2c_board_info pcm037_i2c_devices[] = { |
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c index 0551eb39d97e..18069cb7d068 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
@@ -179,7 +179,6 @@ static struct soc_camera_link base_iclink = { | |||
179 | .reset = marxbot_basecam_reset, | 179 | .reset = marxbot_basecam_reset, |
180 | .board_info = &marxbot_i2c_devices[0], | 180 | .board_info = &marxbot_i2c_devices[0], |
181 | .i2c_adapter_id = 0, | 181 | .i2c_adapter_id = 0, |
182 | .module_name = "mt9t031", | ||
183 | }; | 182 | }; |
184 | 183 | ||
185 | static struct platform_device marxbot_camera[] = { | 184 | static struct platform_device marxbot_camera[] = { |
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-mx3/mx31moboard-smartbot.c index 417757e78c65..04760a53005a 100644 --- a/arch/arm/mach-mx3/mx31moboard-smartbot.c +++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c | |||
@@ -88,7 +88,6 @@ static struct soc_camera_link base_iclink = { | |||
88 | .reset = smartbot_cam_reset, | 88 | .reset = smartbot_cam_reset, |
89 | .board_info = &smartbot_i2c_devices[0], | 89 | .board_info = &smartbot_i2c_devices[0], |
90 | .i2c_adapter_id = 0, | 90 | .i2c_adapter_id = 0, |
91 | .module_name = "mt9t031", | ||
92 | }; | 91 | }; |
93 | 92 | ||
94 | static struct platform_device smartbot_camera[] = { | 93 | static struct platform_device smartbot_camera[] = { |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index ab48bb81b570..ed0dbfdb22ed 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -1015,7 +1015,6 @@ static struct soc_camera_link iclink = { | |||
1015 | .power = em_x270_sensor_power, | 1015 | .power = em_x270_sensor_power, |
1016 | .board_info = &em_x270_i2c_cam_info[0], | 1016 | .board_info = &em_x270_i2c_cam_info[0], |
1017 | .i2c_adapter_id = 0, | 1017 | .i2c_adapter_id = 0, |
1018 | .module_name = "mt9m111", | ||
1019 | }; | 1018 | }; |
1020 | 1019 | ||
1021 | static struct platform_device em_x270_camera = { | 1020 | static struct platform_device em_x270_camera = { |
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index 80a9352d43f3..142c711f4cda 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c | |||
@@ -755,7 +755,6 @@ static struct soc_camera_link a780_iclink = { | |||
755 | .flags = SOCAM_SENSOR_INVERT_PCLK, | 755 | .flags = SOCAM_SENSOR_INVERT_PCLK, |
756 | .i2c_adapter_id = 0, | 756 | .i2c_adapter_id = 0, |
757 | .board_info = &a780_camera_i2c_board_info, | 757 | .board_info = &a780_camera_i2c_board_info, |
758 | .module_name = "mt9m111", | ||
759 | .power = a780_camera_power, | 758 | .power = a780_camera_power, |
760 | .reset = a780_camera_reset, | 759 | .reset = a780_camera_reset, |
761 | }; | 760 | }; |
@@ -1024,7 +1023,6 @@ static struct soc_camera_link a910_iclink = { | |||
1024 | .bus_id = 0, | 1023 | .bus_id = 0, |
1025 | .i2c_adapter_id = 0, | 1024 | .i2c_adapter_id = 0, |
1026 | .board_info = &a910_camera_i2c_board_info, | 1025 | .board_info = &a910_camera_i2c_board_info, |
1027 | .module_name = "mt9m111", | ||
1028 | .power = a910_camera_power, | 1026 | .power = a910_camera_power, |
1029 | .reset = a910_camera_reset, | 1027 | .reset = a910_camera_reset, |
1030 | }; | 1028 | }; |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 0c31fabfc7fd..f5fb915e1315 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -711,7 +711,6 @@ static struct soc_camera_link iclink = { | |||
711 | .bus_id = 0, /* Match id in pxa27x_device_camera in device.c */ | 711 | .bus_id = 0, /* Match id in pxa27x_device_camera in device.c */ |
712 | .board_info = &mioa701_i2c_devices[0], | 712 | .board_info = &mioa701_i2c_devices[0], |
713 | .i2c_adapter_id = 0, | 713 | .i2c_adapter_id = 0, |
714 | .module_name = "mt9m111", | ||
715 | }; | 714 | }; |
716 | 715 | ||
717 | struct i2c_pxa_platform_data i2c_pdata = { | 716 | struct i2c_pxa_platform_data i2c_pdata = { |
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index f56ae1008759..f33647a8e0b7 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
@@ -453,7 +453,6 @@ static struct soc_camera_link iclink[] = { | |||
453 | .query_bus_param = pcm990_camera_query_bus_param, | 453 | .query_bus_param = pcm990_camera_query_bus_param, |
454 | .set_bus_param = pcm990_camera_set_bus_param, | 454 | .set_bus_param = pcm990_camera_set_bus_param, |
455 | .free_bus = pcm990_camera_free_bus, | 455 | .free_bus = pcm990_camera_free_bus, |
456 | .module_name = "mt9v022", | ||
457 | }, { | 456 | }, { |
458 | .bus_id = 0, /* Must match with the camera ID */ | 457 | .bus_id = 0, /* Must match with the camera ID */ |
459 | .board_info = &pcm990_camera_i2c[1], | 458 | .board_info = &pcm990_camera_i2c[1], |
@@ -461,7 +460,6 @@ static struct soc_camera_link iclink[] = { | |||
461 | .query_bus_param = pcm990_camera_query_bus_param, | 460 | .query_bus_param = pcm990_camera_query_bus_param, |
462 | .set_bus_param = pcm990_camera_set_bus_param, | 461 | .set_bus_param = pcm990_camera_set_bus_param, |
463 | .free_bus = pcm990_camera_free_bus, | 462 | .free_bus = pcm990_camera_free_bus, |
464 | .module_name = "mt9m001", | ||
465 | }, | 463 | }, |
466 | }; | 464 | }; |
467 | 465 | ||