diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:47:44 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:47:44 +0900 |
| commit | 9dd056e9eba106ef622795b566f769a9ab0a49a8 (patch) | |
| tree | 390c07ea2c3b9631c2e8fe64c1a6feba0b503e8b /arch/arm/mach-omap2/pm-debug.c | |
| parent | 08ef2e427b59393d68a65b16e97e894b662a5573 (diff) | |
| parent | f2b9726105824fdeea32a339e5072a358f89a25b (diff) | |
| download | linux-9dd056e9eba106ef622795b566f769a9ab0a49a8.tar.gz linux-9dd056e9eba106ef622795b566f769a9ab0a49a8.tar.bz2 linux-9dd056e9eba106ef622795b566f769a9ab0a49a8.zip | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'arch/arm/mach-omap2/pm-debug.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm-debug.c | 4 |
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 a5a83b358ddd..e01da45c0537 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; |