From 6bc8405c6db41ff1647a500ce1ffea74ce8f3767 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@openmoko.com>
Date: Wed, 19 Nov 2008 17:10:49 +0000
Subject: tracking-2.6.27-rc2-include-path-changes.patch

Signed-off-by: Andy Green <andy@openmoko.com>
---
 drivers/mfd/glamo/glamo-core.c     | 2 ++
 drivers/mfd/glamo/glamo-core.h     | 1 -
 drivers/mfd/glamo/glamo-lcm-spi.c  | 2 +-
 drivers/mfd/glamo/glamo-spi-gpio.c | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'drivers/mfd/glamo')

diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index c2a0d254560..7123080e050 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -45,6 +45,8 @@
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 
+//#include <mach/regs-irq.h>
+
 #ifdef CONFIG_PM
 #include <linux/pm.h>
 #endif
diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
index dd6f67c3386..57214de9e00 100644
--- a/drivers/mfd/glamo/glamo-core.h
+++ b/drivers/mfd/glamo/glamo-core.h
@@ -17,7 +17,6 @@
 #define GLAMO_MMC_BUFFER_SIZE (64 * 1024)
 #define GLAMO_FB_SIZE	(GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE)
 
-
 struct glamo_core {
 	int irq;
 	int irq_works; /* 0 means PCB does not support Glamo IRQ */
diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
index 874fb0e8c13..c8ff8a77e95 100644
--- a/drivers/mfd/glamo/glamo-lcm-spi.c
+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
@@ -30,7 +30,7 @@
 
 #include <linux/glamofb.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "glamo-core.h"
 #include "glamo-regs.h"
diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
index ece575022c9..2bf4e38ca8e 100644
--- a/drivers/mfd/glamo/glamo-spi-gpio.c
+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
@@ -30,7 +30,7 @@
 
 #include <linux/glamofb.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "glamo-core.h"
 #include "glamo-regs.h"
-- 
cgit v1.2.3