diff options
author | Tony Lindgren <tony@atomide.com> | 2011-03-10 18:54:14 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-03-10 18:54:14 -0800 |
commit | 94a06b74e724caabcf0464c81527cfbcae0c8aff (patch) | |
tree | 3570b6a627382a5eb5c8328b4959f615544d8e62 /arch/arm/mach-omap2/opp4xxx_data.c | |
parent | 0dde52a9f5330eec240660191a94b51bd911ffcd (diff) | |
parent | 9062511097683b4422f023d181b4a8b2db1a7a72 (diff) | |
download | op-kernel-dev-94a06b74e724caabcf0464c81527cfbcae0c8aff.zip op-kernel-dev-94a06b74e724caabcf0464c81527cfbcae0c8aff.tar.gz |
Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/opp4xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/opp4xxx_data.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c index a11fa56..f0e9939 100644 --- a/arch/arm/mach-omap2/opp4xxx_data.c +++ b/arch/arm/mach-omap2/opp4xxx_data.c @@ -22,6 +22,7 @@ #include <plat/cpu.h> #include "omap_opp_data.h" +#include "pm.h" static struct omap_opp_def __initdata omap44xx_opp_def_list[] = { /* MPU OPP1 - OPP50 */ @@ -42,7 +43,7 @@ static struct omap_opp_def __initdata omap44xx_opp_def_list[] = { /** * omap4_opp_init() - initialize omap4 opp table */ -static int __init omap4_opp_init(void) +int __init omap4_opp_init(void) { int r = -ENODEV; |