fix-stable-tracking-build-without-symlink.patch

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

20 files changed, 41 insertions, 35 deletions

diff --git a/arch/arm/mach-s3c2410/include/mach/gta01.h b/arch/arm/mach-s3c2410/include/mach/gta01.h
index 0a90f9ce218..b93380f6275 100644
--- a/arch/arm/mach-s3c2410/include/mach/gta01.h
+++ b/arch/arm/mach-s3c2410/include/mach/gta01.h
@@ -2,7 +2,7 @@
 #define _GTA01_H
 
 #include <mach/regs-gpio.h>
-#include <asm/arch/irqs.h>
+#include <asm/arch-s3c2410/irqs.h>
 
 /* Different hardware revisions, passed in ATAG_REVISION by u-boot */
 #define GTA01v3_SYSTEM_REV	0x00000130
diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
index 5f3f4190ffd..355f956abef 100644
--- a/arch/arm/mach-s3c2410/pwm.c
+++ b/arch/arm/mach-s3c2410/pwm.c
@@ -23,7 +23,7 @@
 #include <linux/device.h>
 #include <mach/hardware.h>
 #include <asm/plat-s3c/regs-timer.h>
-#include <asm/arch/pwm.h>
+#include <asm/arch-s3c2410/pwm.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
index c2fafbde17c..bb2b69df0c1 100644
--- a/arch/arm/mach-s3c2440/fiq_c_isr.c
+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
@@ -19,7 +19,7 @@
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/irq.h>
 
-#include <asm/arch/pwm.h>
+#include <asm/arch-s3c2410/pwm.h>
 #include <asm/plat-s3c/regs-timer.h>
 
 /*
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 47d863bc7eb..33d6cbafb7b 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -61,14 +61,14 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpioj.h>
 #include <mach/fb.h>
-#include <asm/arch/mci.h>
-#include <asm/arch/ts.h>
+#include <asm/arch-s3c2410/mci.h>
+#include <asm/arch-s3c2410/ts.h>
 #include <mach/spi.h>
-#include <asm/arch/spi-gpio.h>
+#include <asm/arch-s3c2410/spi-gpio.h>
 #include <mach/usb-control.h>
 #include <mach/regs-mem.h>
 
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 
 #include <asm/plat-s3c/regs-serial.h>
 #include <asm/plat-s3c/nand.h>
@@ -83,7 +83,7 @@
 
 #include <linux/glamofb.h>
 
-#include <asm/arch/fiq_ipc_gta02.h>
+#include <asm/arch-s3c2410/fiq_ipc_gta02.h>
 #include "fiq_c_isr.h"
 #include <linux/gta02_hdq.h>
 #include <linux/bq27000_battery.h>
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
index 002adc4627a..8d5274bc5e8 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -25,7 +25,7 @@
 #include <linux/pcf50606.h>
 
 /* For GTA02 */
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include <linux/pcf50633.h>
 
 
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index 5bc1c0c02c8..4a22afb492c 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -28,7 +28,7 @@
 #include <linux/pcf50606.h>
 
 /* For GTA02 */
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include <linux/pcf50633.h>
 
 struct neo1973_pm_gps_data {
@@ -507,11 +507,11 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
 static int gta01_pm_gps_suspend(struct platform_device *pdev,
 				pm_message_t state)
 {
-	if (machine_is_neo1973_gta01()) {
+#ifdef CONFIG_MACH_NEO1973_GTA01
+	if (machine_is_neo1973_gta01())
 		/* FIXME */
 		gps_power_sequence_down();
-	}
-
+#endif
 	if (machine_is_neo1973_gta02())
 		gps_pwron_set(0);
 
@@ -520,10 +520,11 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
 
 static int gta01_pm_gps_resume(struct platform_device *pdev)
 {
+#ifdef CONFIG_MACH_NEO1973_GTA01
 	if (machine_is_neo1973_gta01())
 		if (neo1973_gps.power_was_on)
 			gps_power_sequence_up();
-
+#endif
 	if (machine_is_neo1973_gta02())
 		if (neo1973_gps.power_was_on)
 		    gps_pwron_set(1);
@@ -539,15 +540,17 @@ static DEVICE_ATTR(pwron, 0644, power_gps_read, power_gps_write);
 
 
 static struct attribute *gta01_gps_sysfs_entries[] = {
-	&dev_attr_power_avdd_3v.attr,
 	&dev_attr_pwron.attr,
+#ifdef CONFIG_MACH_NEO1973_GTA01
+	&dev_attr_power_avdd_3v.attr,
 	&dev_attr_reset.attr,
 	&dev_attr_power_lp_io_3v3.attr,
 	&dev_attr_power_pll_core_2v5.attr,
 	&dev_attr_power_sequence.attr,
 	NULL,	/* power_core_1v5 */
 	NULL,	/* power_vdd_core_1v5 */
-	NULL	/* terminating entry */
+#endif
+	NULL    /* terminating entry */
 };
 
 static struct attribute_group gta01_gps_attr_group = {
@@ -593,6 +596,7 @@ static int __init gta01_pm_gps_probe(struct platform_device *pdev)
 			break;
 		}
 
+#ifdef CONFIG_MACH_NEO1973_GTA01
 		gps_power_sequence_down();
 
 		switch (system_rev) {
@@ -610,7 +614,7 @@ static int __init gta01_pm_gps_probe(struct platform_device *pdev)
 						&dev_attr_power_vdd_core_1v5.attr;
 			break;
 		}
-
+#endif
 		return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
 	}
 
@@ -643,7 +647,9 @@ static int __init gta01_pm_gps_probe(struct platform_device *pdev)
 static int gta01_pm_gps_remove(struct platform_device *pdev)
 {
 	if (machine_is_neo1973_gta01()) {
+#ifdef CONFIG_MACH_NEO1973_GTA01
 		gps_power_sequence_down();
+#endif
 		sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
 	}
 
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index ad0d9c8997d..cd0fd64e412 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -23,12 +23,12 @@
 #include <asm/mach-types.h>
 #include <mach/gta01.h>
 #include <asm/plat-s3c24xx/neo1973.h>
-#include <asm/arch/s3c24xx-serial.h>
+#include <asm/arch-s3c2410/s3c24xx-serial.h>
 
 #include <mach/hardware.h>
 
 /* For GTA02 */
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include <linux/pcf50633.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpioj.h>
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
index 4dc0ca9ff01..a0c7cc198fb 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 
 #ifdef CONFIG_MACH_NEO1973_GTA02
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include <linux/pcf50633.h>
 
 static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr,
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
index 90bbc711ea6..da529c7a566 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
@@ -21,7 +21,7 @@
 #include <asm/mach-types.h>
 
 #ifdef CONFIG_MACH_NEO1973_GTA02
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include <linux/pcf50633.h>
 #endif
 
diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
index 09b1bf1d755..062ac2f2fe8 100644
--- a/arch/arm/plat-s3c24xx/neo1973_version.c
+++ b/arch/arm/plat-s3c24xx/neo1973_version.c
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 
 #ifdef CONFIG_MACH_NEO1973_GTA02
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 
 static ssize_t version_read(struct device *dev, struct device_attribute *attr,
 			    char *buf)
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 5b4cd52ec01..0150f85db70 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -55,7 +55,7 @@
 #include <asm/irq.h>
 
 #include <mach/regs-gpio.h>
-#include <asm/arch/ts.h>
+#include <asm/arch-s3c2410/ts.h>
 
 #include <asm/plat-s3c/regs-adc.h>
 
diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
index 706f99fc6b3..0b3f02a9ace 100644
--- a/drivers/leds/leds-neo1973-gta02.c
+++ b/drivers/leds/leds-neo1973-gta02.c
@@ -17,7 +17,7 @@
 #include <linux/leds.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include <asm/plat-s3c/regs-timer.h>
 #include <asm/plat-s3c24xx/neo1973.h>
 
diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
index c3f24768e5e..3cead0f2361 100644
--- a/drivers/leds/leds-neo1973-vibrator.c
+++ b/drivers/leds/leds-neo1973-vibrator.c
@@ -19,7 +19,7 @@
 #include <linux/leds.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pwm.h>
+#include <asm/arch-s3c2410/pwm.h>
 #include <mach/gta01.h>
 #include <asm/plat-s3c/regs-timer.h>
 
diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
index 6f65b367a67..cbade86664a 100644
--- a/drivers/power/gta02_hdq.c
+++ b/drivers/power/gta02_hdq.c
@@ -17,8 +17,8 @@
 #include <linux/platform_device.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/arch/gta02.h>
-#include <asm/arch/fiq_ipc_gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
+#include <asm/arch-s3c2410/fiq_ipc_gta02.h>
 
 
 
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
index 4f261556a2e..8fd3f40afc4 100644
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
@@ -46,10 +46,10 @@
 #include <asm/dma.h>
 #include <asm/dma-mapping.h>
 
-#include <asm/arch/regs-sdi.h>
+#include <asm/arch-s3c2410/regs-sdi.h>
 #include <mach/regs-gpio.h>
-#include <asm/arch/mci.h>
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/mci.h>
+#include <asm/arch-s3c2410/gta02.h>
 
 #include "s3c24xx_hcd.h"
 
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 69637036056..47da353cf67 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -22,7 +22,7 @@
 #include <linux/spi/spi_bitbang.h>
 
 #include <mach/regs-gpio.h>
-#include <asm/arch/spi-gpio.h>
+#include <asm/arch-s3c2410/spi-gpio.h>
 #include <mach/hardware.h>
 
 struct s3c2410_spigpio {
diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
index 9b5a3a270ae..a96a0233919 100644
--- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
@@ -16,7 +16,7 @@
  * for testing
  */
 
-#include <asm/arch/pwm.h>
+#include <asm/arch-s3c2410/pwm.h>
 #include <asm/plat-s3c/regs-timer.h>
 
 extern u8 fiq_ready;
diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
index b007ce7e7d5..c376b899779 100644
--- a/include/asm-arm/arch-s3c2410/gta02.h
+++ b/include/asm-arm/arch-s3c2410/gta02.h
@@ -2,7 +2,7 @@
 #define _GTA02_H
 
 #include <mach/regs-gpio.h>
-#include <asm/arch/irqs.h>
+#include <asm/arch-s3c2410/irqs.h>
 
 /* Different hardware revisions, passed in ATAG_REVISION by u-boot */
 #define GTA02v1_SYSTEM_REV	0x00000310
diff --git a/kernel/printk.c b/kernel/printk.c
index c81ad8638aa..584dcf029b1 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -37,7 +37,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/plat-s3c24xx/neo1973.h>
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 
 /*
  * Architectures can override it:
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index e847acc225a..3997005976e 100644
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 #include <mach/spi-gpio.h>
 #include <mach/regs-gpioj.h>
-#include <asm/arch/gta02.h>
+#include <asm/arch-s3c2410/gta02.h>
 #include "../codecs/wm8753.h"
 #include "s3c24xx-pcm.h"
 #include "s3c24xx-i2s.h"