diff options
| author | merge <null@invalid> | 2009-01-22 13:55:32 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-22 13:55:32 +0000 |
| commit | aa6f5ffbdba45aa8e19e5048648fc6c7b25376d3 (patch) | |
| tree | fbb786d0ac6f8a774fd834e9ce951197e60fbffa /drivers/misc/neo1973_pm_resume_reason.c | |
| parent | f2d78193eae5dccd3d588d2c8ea0866efc368332 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141
pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141 / fdf777a63bcb59e0dfd78bfe2c6242e01f6d4eb9 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040
stable-tracking-hist top was MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040 / 90463bfd2d5a3c8b52f6e6d71024a00e052b0ced ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-mokopatches-tracking-hist-fix-stray-endmenu-patch
mokopatches-tracking-hist top was fix-stray-endmenu-patch / 3630e0be570de8057e7f8d2fe501ed353cdf34e6 ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
fix-stray-endmenu.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/misc/neo1973_pm_resume_reason.c')
| -rw-r--r-- | drivers/misc/neo1973_pm_resume_reason.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/neo1973_pm_resume_reason.c b/drivers/misc/neo1973_pm_resume_reason.c index 62984a50a0a..c7730b60da9 100644 --- a/drivers/misc/neo1973_pm_resume_reason.c +++ b/drivers/misc/neo1973_pm_resume_reason.c @@ -22,7 +22,7 @@ #ifdef CONFIG_MACH_NEO1973_GTA02 #include <mach/gta02.h> -#include <linux/mfd/pcf50633/core.h> +#include <linux/pcf50633.h> #endif static unsigned int *gstatus4_mapped; @@ -79,8 +79,8 @@ static ssize_t resume_reason_read(struct device *dev, end += sprintf(end, " %s\n", resume_reasons[gta][bit]); #ifdef CONFIG_MACH_NEO1973_GTA02 - if ((gta) && (bit == 9)); /* PMU */ -// end += pcf50633_report_resumers(gta02_pcf_pdata.pcf, end); + if ((gta) && (bit == 9)) /* PMU */ + end += pcf50633_report_resumers(pcf50633_global, end); #endif } |