aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-24 08:13:36 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-24 08:13:36 +0000
commitee4642aa62413667969261b94b5457f97d49f06e (patch)
tree6ccfd6eaf3d81a565919c5d8213f468c128dab57 /arch
parent2aba65485d5488f034941fe396315d2d6cb3e4d1 (diff)
fix-gta02-gps-breakage-stale-save.patch
Managed to infect earlier patch with stale file in kate breaking gta02 build in andy-tracking. Reported-by: Scott Talbot <psyc@stalbot.com> Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_gps.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index 8f0a6291db4..1b918939826 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -29,7 +29,6 @@
/* For GTA02 */
#include <mach/gta02.h>
-#include <linux/pcf50633.h>
#include <linux/regulator/consumer.h>
@@ -276,8 +275,6 @@ static int gps_power_1v5_get(void)
static void gps_pwron_set(int on)
{
- neo1973_gps.power_was_on = !!on;
-
if (machine_is_neo1973_gta01())
neo1973_gpb_setpin(GTA01_GPIO_GPS_PWRON, on);
@@ -303,6 +300,8 @@ static void gps_pwron_set(int on)
if ((!on) && (neo1973_gps.power_was_on))
regulator_disable(neo1973_gps.regulator);
}
+
+ neo1973_gps.power_was_on = !!on;
}
static int gps_pwron_get(void)