From 7aa193419ca74b82c42f30d480f69322a8c06552 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 13 Mar 2009 06:08:20 -0300 Subject: [PATCH] --- yaml --- r: 138176 b: refs/heads/master c: d42574d1d26a17b5c4a3e9d5cbd2e5cacfd550fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/pcm990-baseboard.c | 1 - trunk/include/media/soc_camera.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fc51c2db039a..c5942ccbe558 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e958e27adeade7fa085dd396a8a0dfaef7e338c1 +refs/heads/master: d42574d1d26a17b5c4a3e9d5cbd2e5cacfd550fa diff --git a/trunk/arch/arm/mach-pxa/pcm990-baseboard.c b/trunk/arch/arm/mach-pxa/pcm990-baseboard.c index 90a399075ff6..6112740b4ae9 100644 --- a/trunk/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/trunk/arch/arm/mach-pxa/pcm990-baseboard.c @@ -421,7 +421,6 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link) static struct soc_camera_link iclink = { .bus_id = 0, /* Must match with the camera ID above */ - .gpio = NR_BUILTIN_GPIO + 1, .query_bus_param = pcm990_camera_query_bus_param, .set_bus_param = pcm990_camera_set_bus_param, }; diff --git a/trunk/include/media/soc_camera.h b/trunk/include/media/soc_camera.h index b44fa0952ad9..37013688af44 100644 --- a/trunk/include/media/soc_camera.h +++ b/trunk/include/media/soc_camera.h @@ -95,8 +95,6 @@ struct soc_camera_host_ops { struct soc_camera_link { /* Camera bus id, used to match a camera and a bus */ int bus_id; - /* GPIO number to switch between 8 and 10 bit modes */ - unsigned int gpio; /* Per camera SOCAM_SENSOR_* bus flags */ unsigned long flags; /* Optional callbacks to power on or off and reset the sensor */