diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-13 16:40:25 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-13 16:40:25 +0200 |
| commit | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (patch) | |
| tree | f901bdcb5b20e93261cf9cf324ebbcf3fd24ce58 /arch/arm/mach-omap2 | |
| parent | omap: pandora: fix NAND support (diff) | |
| parent | OMAP: PM: omap_device: fix device power domain callbacks (diff) | |
| download | linux-c8e0bf95fc01d6e2ca585fe08010800b6c56e823.tar.xz linux-c8e0bf95fc01d6e2ca585fe08010800b6c56e823.zip | |
Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm/mach-omap2')
| -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; |