aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBalaji Rao <balajirrao@openmoko.org>2009-01-27 14:38:47 +0000
committerAndy Green <agreen@octopus.localdomain>2009-01-27 14:38:47 +0000
commitcc0a09e9e49f6121622d8579b23018e378a29e23 (patch)
treea2afab35675965fda86fb12ee1081e5830289865 /arch
parent0c3f9b02b0fd87a0f07ff9f7d9e5afd6d1c52ebc (diff)
Subject: pcf50633_rebase_changes.patch
X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=57b3df284f5a79346f2b25003f76c6702cf84c25 pcf50633_rebase_changes.patch This patch brings all changes from balaji-tracking originally intended for upstream into andy-tracking.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_gps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index 9b455229e6d..26a49d4fbd4 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -52,6 +52,8 @@ enum gta01_pm_gps_supplies {
GTA01_GPS_NUM_REG
};
+#include <linux/err.h>
+
struct neo1973_pm_gps_data {
#ifdef CONFIG_PM
int keep_on_in_suspend;