From 2c160fd51284d19f28048001ea78402af3df8d0c Mon Sep 17 00:00:00 2001 From: Sergio Aguirre Date: Thu, 14 Jan 2010 11:01:15 -0600 Subject: [PATCH] --- yaml --- r: 179771 b: refs/heads/master c: 6b34f9d4e60a4fb9f847533a207e31316603e840 h: refs/heads/master i: 179769: 49c5b7be67d2bb76d88e6d2306b2b1447ffaf986 179767: f22d70e3edeee80aa2330266c613e153efd08a8e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/pm-debug.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 072d56211096..12a1a0381d38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b92c5721d28507738d294e9a582eb6232ec6abad +refs/heads/master: 6b34f9d4e60a4fb9f847533a207e31316603e840 diff --git a/trunk/arch/arm/mach-omap2/pm-debug.c b/trunk/arch/arm/mach-omap2/pm-debug.c index 562d190cd66c..a0866268aa41 100644 --- a/trunk/arch/arm/mach-omap2/pm-debug.c +++ b/trunk/arch/arm/mach-omap2/pm-debug.c @@ -54,8 +54,6 @@ int omap2_pm_debug; regs[reg_count++].val = \ __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off))) -static int __init pm_dbg_init(void); - void omap2_pm_dump(int mode, int resume, unsigned int us) { struct reg { @@ -167,6 +165,8 @@ struct dentry *pm_dbg_dir; static int pm_dbg_init_done; +static int __init pm_dbg_init(void); + enum { DEBUG_FILE_COUNTERS = 0, DEBUG_FILE_TIMERS,