Nishanth Menon <[email protected]> writes:
> omap3 and omap4 opp_init should be made non-static to allow
> for platform specific opp table tweaking. making these static
> conflicts with the definition in pm.h(global) as well.
> we include pm.h as well to ensure that there are no such prototype
> conflicts with actual implementation in the future.
>
> Signed-off-by: Nishanth Menon <[email protected]>
Thanks, queuing for 2.6.39 (branch: for_2.6.39/pm-misc)
Kevin
> ---
> arch/arm/mach-omap2/opp3xxx_data.c | 3 ++-
> arch/arm/mach-omap2/opp4xxx_data.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/opp3xxx_data.c
> b/arch/arm/mach-omap2/opp3xxx_data.c
> index 0486fce..fd3a1af 100644
> --- a/arch/arm/mach-omap2/opp3xxx_data.c
> +++ b/arch/arm/mach-omap2/opp3xxx_data.c
> @@ -21,6 +21,7 @@
> #include <plat/cpu.h>
>
> #include "omap_opp_data.h"
> +#include "pm.h"
>
> static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {
> /* MPU OPP1 */
> @@ -88,7 +89,7 @@ static struct omap_opp_def __initdata
> omap36xx_opp_def_list[] = {
> /**
> * omap3_opp_init() - initialize omap3 opp table
> */
> -static int __init omap3_opp_init(void)
> +int __init omap3_opp_init(void)
> {
> int r = -ENODEV;
>
> 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
