Merge branch 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

[karo-tx-linux.git] / arch / arm / mach-pxa / pcm990-baseboard.c

diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 6d5b7e0621248d50dcb4dd90c0f876c6ec7471f5..6d38c6548b3d4ba0c6dcc0471819fca0ab7b9ee5 100644 (file)
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -19,7 +19,7 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
-
+#include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
@@ -28,7 +28,6 @@
 
 #include <media/soc_camera.h>
 
-#include <asm/gpio.h>
 #include <mach/camera.h>
 #include <asm/mach/map.h>
 #include <mach/pxa27x.h>
@@ -395,9 +394,9 @@ static int pcm990_camera_set_bus_param(struct soc_camera_link *link,
        }
 
        if (flags & SOCAM_DATAWIDTH_8)
-               gpio_set_value(gpio_bus_switch, 1);
+               gpio_set_value_cansleep(gpio_bus_switch, 1);
        else
-               gpio_set_value(gpio_bus_switch, 0);
+               gpio_set_value_cansleep(gpio_bus_switch, 0);
 
        return 0;
 }