[PATCH 04/11] Fix build warnings that depend on machine configuration

Jonas Bonn jonas.bonn at gmail.com
Wed Oct 1 16:30:41 CEST 2008


---
 arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |    2 ++
 arch/arm/plat-s3c24xx/neo1973_pm_gps.c |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
index c833a74..de0faf2 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -86,7 +86,9 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
 			const char *buf, size_t count)
 {
 	unsigned long on = simple_strtoul(buf, NULL, 10);
+#ifdef CONFIG_MACH_NEO1973_GTA02
 	unsigned int vol;
+#endif
 
 	if (!strcmp(attr->attr.name, "power_on")) {
 		switch (machine_arch_type) {
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index 111779e..57f1695 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -537,6 +537,7 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
 #define gta01_pm_gps_resume	NULL
 #endif
 
+#ifdef CONFIG_MACH_NEO1973_GTA01
 static struct attribute *gta01_gps_sysfs_entries[] = {
 	&dev_attr_power_avdd_3v.attr,
 	&dev_attr_pwron.attr,
@@ -553,7 +554,9 @@ static struct attribute_group gta01_gps_attr_group = {
 	.name	= NULL,
 	.attrs	= gta01_gps_sysfs_entries,
 };
+#endif
 
+#ifdef CONFIG_MACH_NEO1973_GTA02
 static struct attribute *gta02_gps_sysfs_entries[] = {
 	&dev_attr_pwron.attr,
 	NULL
@@ -563,6 +566,7 @@ static struct attribute_group gta02_gps_attr_group = {
 	.name	= NULL,
 	.attrs	= gta02_gps_sysfs_entries,
 };
+#endif
 
 static int __init gta01_pm_gps_probe(struct platform_device *pdev)
 {
-- 
1.5.4.3




More information about the openmoko-kernel mailing list