From e43ba95be5ac0fe8418aba4306208274c734dd30 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Fri, 24 Apr 2009 17:53:05 +0200
Subject: ARM: update pcm990-baseboard.c to match mainline

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
kernel-sync:
---
 linux/arch/arm/mach-pxa/pcm990-baseboard.c | 31 +++---------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

(limited to 'linux/arch/arm/mach-pxa')

diff --git a/linux/arch/arm/mach-pxa/pcm990-baseboard.c b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
index 7a95c80ab..6c12b5a31 100644
--- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -22,46 +22,21 @@
 
 #include <linux/irq.h>
 #include <linux/platform_device.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
-#include <linux/ide.h>
-#endif
 #include <linux/i2c.h>
 #include <linux/pwm_backlight.h>
 
 #include <media/soc_camera.h>
 
 #include <asm/gpio.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
-#include <asm/arch/i2c.h>
-#include <asm/arch/camera.h>
-#else
 #include <mach/i2c.h>
 #include <mach/camera.h>
-#endif
 #include <asm/mach/map.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/audio.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/ohci.h>
-#include <asm/arch/pcm990_baseboard.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mfp-pxa27x.h>
-#else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
-#include <mach/pxa-regs.h>
-#else
 #include <mach/pxa27x.h>
-#endif
 #include <mach/audio.h>
 #include <mach/mmc.h>
 #include <mach/ohci.h>
 #include <mach/pcm990_baseboard.h>
 #include <mach/pxafb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
-#include <mach/mfp-pxa27x.h>
-#endif
-#endif
 
 #include "devices.h"
 #include "generic.h"
@@ -402,7 +377,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
 #include <linux/i2c/pca953x.h>
 
 static struct pca953x_platform_data pca9536_data = {
-	.gpio_base	= NR_BUILTIN_GPIO + 1,
+	.gpio_base	= NR_BUILTIN_GPIO,
 };
 
 static int gpio_bus_switch;
@@ -430,9 +405,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)
 	int ret;
 
 	if (!gpio_bus_switch) {
-		ret = gpio_request(NR_BUILTIN_GPIO + 1, "camera");
+		ret = gpio_request(NR_BUILTIN_GPIO, "camera");
 		if (!ret) {
-			gpio_bus_switch = NR_BUILTIN_GPIO + 1;
+			gpio_bus_switch = NR_BUILTIN_GPIO;
 			gpio_direction_output(gpio_bus_switch, 0);
 		} else
 			gpio_bus_switch = -EINVAL;
-- 
cgit v1.2.3