diff options
| author |  Russell King <rmk@dyn-67.arm.linux.org.uk>
| 2008-11-27 23:50:31 +0000 |
|---|---|---|
| committer |  Russell King <rmk+kernel@arm.linux.org.uk>
| 2008-11-27 23:50:31 +0000 |
| commit | af38d90d6a5e135b546a3f86222ba2ad895ba4ae (patch) | |
| tree | be95246103a3217d301f38b96a252d2116067825 /arch/arm/mach-pxa/pcm990-baseboard.c | |
| parent | Allow architectures to override copy_user_highpage() (diff) | |
| parent | [ARM] pxa/palmtx: misc fixes to use generic GPIO API (diff) | |
| download | linux-af38d90d6a5e135b546a3f86222ba2ad895ba4ae.tar.gz linux-af38d90d6a5e135b546a3f86222ba2ad895ba4ae.tar.bz2 linux-af38d90d6a5e135b546a3f86222ba2ad895ba4ae.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 f601425f1b1e..b36cec5c9eed 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c @@ -385,6 +385,7 @@ static struct soc_camera_link iclink[] = { .gpio = NR_BUILTIN_GPIO + 1, }, { .bus_id = 0, /* Must match with the camera ID above */ + .gpio = -ENXIO, } }; |