fix-stable-tracking-build-without-symlink.patch
authorAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:11:02 +0000 (17:11 +0000)
committerAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:11:02 +0000 (17:11 +0000)
Signed-off-by: Andy Green <andy@openmoko.com>
20 files changed:
arch/arm/mach-s3c2410/include/mach/gta01.h
arch/arm/mach-s3c2410/pwm.c
arch/arm/mach-s3c2440/fiq_c_isr.c
arch/arm/mach-s3c2440/mach-gta02.c
arch/arm/plat-s3c24xx/neo1973_pm_bt.c
arch/arm/plat-s3c24xx/neo1973_pm_gps.c
arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
arch/arm/plat-s3c24xx/neo1973_pm_host.c
arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
arch/arm/plat-s3c24xx/neo1973_version.c
drivers/input/touchscreen/s3c2410_ts.c
drivers/leds/leds-neo1973-gta02.c
drivers/leds/leds-neo1973-vibrator.c
drivers/power/gta02_hdq.c
drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
drivers/spi/spi_s3c24xx_gpio.c
include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
include/asm-arm/arch-s3c2410/gta02.h
kernel/printk.c
sound/soc/s3c24xx/neo1973_gta02_wm8753.c

index 0a90f9c..b93380f 100644 (file)
@@ -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
index 5f3f419..355f956 100644 (file)
@@ -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
index c2fafbd..bb2b69d 100644 (file)
@@ -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>
 
 /*
index 47d863b..33d6cba 100644 (file)
 #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>
index 002adc4..8d5274b 100644 (file)
@@ -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>
 
 
index 5bc1c0c..4a22afb 100644 (file)
@@ -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);
        }
 
index ad0d9c8..cd0fd64 100644 (file)
 #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>
index 4dc0ca9..a0c7cc1 100644 (file)
@@ -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,
index 90bbc71..da529c7 100644 (file)
@@ -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
 
index 09b1bf1..062ac2f 100644 (file)
@@ -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)
index 5b4cd52..0150f85 100644 (file)
@@ -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>
 
index 706f99f..0b3f02a 100644 (file)
@@ -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>
 
index c3f2476..3cead0f 100644 (file)
@@ -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>
 
index 6f65b36..cbade86 100644 (file)
@@ -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>
 
 
 
index 4f26155..8fd3f40 100644 (file)
 #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"
 
index 6963703..47da353 100644 (file)
@@ -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 {
index 9b5a3a2..a96a023 100644 (file)
@@ -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;
index b007ce7..c376b89 100644 (file)
@@ -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
index c81ad86..584dcf0 100644 (file)
@@ -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:
index e847acc..3997005 100644 (file)
@@ -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"