tracking-2.6.27-rc2-include-path-changes.patch

Signed-off-by: Andy Green <andy@openmoko.com>

5 files changed, 11 insertions, 10 deletions

diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h
index 9c1a7ebf080..15da41c9f84 100644
--- a/include/asm-arm/arch-s3c2410/gpio.h
+++ b/include/asm-arm/arch-s3c2410/gpio.h
@@ -21,8 +21,8 @@
 #define __ASM_ARCH_S3C2410_GPIO_H
 
 #include <asm/irq.h>
-#include <asm/hardware.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/hardware.h>
+#include <mach/regs-gpio.h>
 
 int gpio_request(unsigned gpio, const char *label);
 void gpio_free(unsigned gpio);
diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h
index 989aa5510a6..0a90f9ce218 100644
--- a/include/asm-arm/arch-s3c2410/gta01.h
+++ b/include/asm-arm/arch-s3c2410/gta01.h
@@ -1,7 +1,7 @@
 #ifndef _GTA01_H
 #define _GTA01_H
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/arch/irqs.h>
 
 /* Different hardware revisions, passed in ATAG_REVISION by u-boot */
diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
index 791ea4fc4c3..b007ce7e7d5 100644
--- a/include/asm-arm/arch-s3c2410/gta02.h
+++ b/include/asm-arm/arch-s3c2410/gta02.h
@@ -1,7 +1,7 @@
 #ifndef _GTA02_H
 #define _GTA02_H
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/arch/irqs.h>
 
 /* Different hardware revisions, passed in ATAG_REVISION by u-boot */
diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/include/asm-arm/arch-s3c2410/irqs.h
index ea945ea0899..caef9f97570 100644
--- a/include/asm-arm/arch-s3c2410/irqs.h
+++ b/include/asm-arm/arch-s3c2410/irqs.h
@@ -12,9 +12,9 @@
 #ifndef __ASM_ARCH_IRQS_H
 #define __ASM_ARCH_IRQS_H __FILE__
 
-#ifndef __ASM_ARM_IRQ_H
-#error "Do not include this directly, instead #include <asm/irq.h>"
-#endif
+//#ifndef __ASM_ARM_IRQ_H
+//#error "Do not include this directly, instead #include <asm/irq.h>"
+//#endif
 
 /* we keep the first set of CPU IRQs out of the range of
  * the ISA space, so that the PC104 has them to itself
@@ -178,6 +178,7 @@
 #define NR_IRQS			(IRQ_BOARD_START)
 #endif
 
+#if 0
 /* Neo1973 GTA02 interrupts */
 #define NEO1973_GTA02_IRQ(x)	(IRQ_BOARD_START + (x))
 #define IRQ_GLAMO(x)		NEO1973_GTA02_IRQ(x)
@@ -190,5 +191,5 @@
 #define IRQ_GLAMO_2D		IRQ_GLAMO(6)
 #define IRQ_GLAMO_MMC		IRQ_GLAMO(7)
 #define IRQ_GLAMO_RISC		IRQ_GLAMO(8)
-
+#endif
 #endif /* __ASM_ARCH_IRQ_H */
diff --git a/include/asm-arm/arch-s3c2410/pwm.h b/include/asm-arm/arch-s3c2410/pwm.h
index a797ec359e2..b77a40e7106 100644
--- a/include/asm-arm/arch-s3c2410/pwm.h
+++ b/include/asm-arm/arch-s3c2410/pwm.h
@@ -5,8 +5,8 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 
-#include <asm-arm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/io.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/plat-s3c/regs-timer.h>
 #include <asm/arch/gta01.h>