diff options
| author | Alex Elder <elder@ieee.org> | 2009-09-10 15:33:56 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-10 15:33:56 -0400 |
| commit | a4872d5b6ad69a49975c0268828b5bb2317ea5a0 (patch) | |
| tree | f79577c2731753efb621ef62774949c1e0acdaad /arch/arm/mach-omap2/pm24xx.c | |
| parent | 4734d401d43c6469d568caf223d37aa0fc1bf4dc (diff) | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index db1025562fb0..528dbdc26e23 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
| @@ -470,7 +470,7 @@ static void __init prcm_setup_regs(void) | |||
| 470 | WKUP_MOD, PM_WKEN); | 470 | WKUP_MOD, PM_WKEN); |
| 471 | } | 471 | } |
| 472 | 472 | ||
| 473 | int __init omap2_pm_init(void) | 473 | static int __init omap2_pm_init(void) |
| 474 | { | 474 | { |
| 475 | u32 l; | 475 | u32 l; |
| 476 | 476 | ||