aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-pxa/pcm990-baseboard.c1
-rw-r--r--include/media/soc_camera.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 90a399075ff6..6112740b4ae9 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -421,7 +421,6 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)
421 421
422static struct soc_camera_link iclink = { 422static struct soc_camera_link iclink = {
423 .bus_id = 0, /* Must match with the camera ID above */ 423 .bus_id = 0, /* Must match with the camera ID above */
424 .gpio = NR_BUILTIN_GPIO + 1,
425 .query_bus_param = pcm990_camera_query_bus_param, 424 .query_bus_param = pcm990_camera_query_bus_param,
426 .set_bus_param = pcm990_camera_set_bus_param, 425 .set_bus_param = pcm990_camera_set_bus_param,
427}; 426};
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index b44fa0952ad9..37013688af44 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -95,8 +95,6 @@ struct soc_camera_host_ops {
95struct soc_camera_link { 95struct soc_camera_link {
96 /* Camera bus id, used to match a camera and a bus */ 96 /* Camera bus id, used to match a camera and a bus */
97 int bus_id; 97 int bus_id;
98 /* GPIO number to switch between 8 and 10 bit modes */
99 unsigned int gpio;
100 /* Per camera SOCAM_SENSOR_* bus flags */ 98 /* Per camera SOCAM_SENSOR_* bus flags */
101 unsigned long flags; 99 unsigned long flags;
102 /* Optional callbacks to power on or off and reset the sensor */ 100 /* Optional callbacks to power on or off and reset the sensor */