Merge git://git.marvell.com/orion into devel

2008-12-13 09:12:51 +00:00
parent 67fbc23123 58c2467355
commit 72aaf09fda
294 changed files with 6020 additions and 2450 deletions
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -389,6 +389,7 @@ static struct soc_camera_link iclink[] = {
 		.gpio	= NR_BUILTIN_GPIO + 1,
 	}, {
 		.bus_id	= 0, /* Must match with the camera ID above */
+		.gpio	= -ENXIO,
 	}
 };