diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /arch/arm/mach-omap2/pm-debug.c | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
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; | |||
| 189 | 189 | ||
| 190 | static int pm_dbg_init_done; | 190 | static int pm_dbg_init_done; |
| 191 | 191 | ||
| 192 | static int __init pm_dbg_init(void); | 192 | static int pm_dbg_init(void); |
| 193 | 193 | ||
| 194 | enum { | 194 | enum { |
| 195 | DEBUG_FILE_COUNTERS = 0, | 195 | DEBUG_FILE_COUNTERS = 0, |
| @@ -595,7 +595,7 @@ static int option_set(void *data, u64 val) | |||
| 595 | 595 | ||
| 596 | DEFINE_SIMPLE_ATTRIBUTE(pm_dbg_option_fops, option_get, option_set, "%llu\n"); | 596 | DEFINE_SIMPLE_ATTRIBUTE(pm_dbg_option_fops, option_get, option_set, "%llu\n"); |
| 597 | 597 | ||
| 598 | static int __init pm_dbg_init(void) | 598 | static int pm_dbg_init(void) |
| 599 | { | 599 | { |
| 600 | int i; | 600 | int i; |
| 601 | struct dentry *d; | 601 | struct dentry *d; |