diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /arch/arm/mach-pxa/pcm990-baseboard.c | |
| parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
| parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/mach-pxa/pcm990-baseboard.c')
| -rw-r--r-- | arch/arm/mach-pxa/pcm990-baseboard.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 1e7515452285..3ea01e0eac63 100644 --- 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[] = { | |||
| 389 | .gpio = NR_BUILTIN_GPIO + 1, | 389 | .gpio = NR_BUILTIN_GPIO + 1, |
| 390 | }, { | 390 | }, { |
| 391 | .bus_id = 0, /* Must match with the camera ID above */ | 391 | .bus_id = 0, /* Must match with the camera ID above */ |
| 392 | .gpio = -ENXIO, | ||
| 392 | } | 393 | } |
| 393 | }; | 394 | }; |
| 394 | 395 | ||