summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm-debug.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-24 17:16:40 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-06-24 17:16:40 +0900
commit20733d59d5763ecd96276f868c1f39e677b3b4e2 (patch)
tree89177676a2a45afa97595ce1827630aa131c51e2 /arch/arm/mach-omap2/pm-debug.c
parent75e1b6a84f7e2186e843da94751b6d175caf9209 (diff)
parent17e8c4e1ebf139743e3830439fa65fd906af4a43 (diff)
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'arch/arm/mach-omap2/pm-debug.c')
-rw-r--r--arch/arm/mach-omap2/pm-debug.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index a5a83b358dd..e01da45c053 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -189,7 +189,7 @@ static struct dentry *pm_dbg_dir;
static int pm_dbg_init_done;
-static int __init pm_dbg_init(void);
+static int pm_dbg_init(void);
enum {
DEBUG_FILE_COUNTERS = 0,
@@ -595,7 +595,7 @@ static int option_set(void *data, u64 val)
DEFINE_SIMPLE_ATTRIBUTE(pm_dbg_option_fops, option_get, option_set, "%llu\n");
-static int __init pm_dbg_init(void)
+static int pm_dbg_init(void)
{
int i;
struct dentry *d;