From b7f4c2f2025ec254202e95c900b5281904264306 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:11:02 +0000 Subject: fix-stable-tracking-build-without-symlink.patch Signed-off-by: Andy Green --- arch/arm/mach-s3c2410/include/mach/gta01.h | 2 +- arch/arm/mach-s3c2410/pwm.c | 2 +- arch/arm/mach-s3c2440/fiq_c_isr.c | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 10 +++++----- arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 2 +- arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 22 ++++++++++++++-------- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 4 ++-- arch/arm/plat-s3c24xx/neo1973_pm_host.c | 2 +- arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c | 2 +- arch/arm/plat-s3c24xx/neo1973_version.c | 2 +- 10 files changed, 28 insertions(+), 22 deletions(-) (limited to 'arch') 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 -#include +#include /* 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 #include #include -#include +#include #include #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 #include -#include +#include #include /* 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 #include #include -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include #include #include @@ -83,7 +83,7 @@ #include -#include +#include #include "fiq_c_isr.h" #include #include 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 /* For GTA02 */ -#include +#include #include 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 /* For GTA02 */ -#include +#include #include 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, >a01_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, >a01_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 #include #include -#include +#include #include /* For GTA02 */ -#include +#include #include #include #include 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 #ifdef CONFIG_MACH_NEO1973_GTA02 -#include +#include #include 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 #ifdef CONFIG_MACH_NEO1973_GTA02 -#include +#include #include #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 #ifdef CONFIG_MACH_NEO1973_GTA02 -#include +#include static ssize_t version_read(struct device *dev, struct device_attribute *attr, char *buf) -- cgit v1.2.3