diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-30 00:45:47 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 23:37:13 +0100 |
| commit | 5c2e88525b5f1cdc72c9eefba72dae13be7e5d20 (patch) | |
| tree | 09d5b531c59b9039e23d933b9b266f0e10d73910 /arch/arm/mach-omap2/common.h | |
| parent | ARM: OMAP: Move omap-pm-noop.c local to mach-omap2 (diff) | |
| download | linux-5c2e88525b5f1cdc72c9eefba72dae13be7e5d20.tar.xz linux-5c2e88525b5f1cdc72c9eefba72dae13be7e5d20.zip | |
ARM: OMAP: Remove plat-omap/common.h
Most of the prototypes in plat-omap/common.h are not
common to omap1 and omap2+, they are local to omap2+
and should not be in plat-omap/common.h.
The only shared function prototype in this file is
omap_init_clocksource_32k(), let's put that into
counter-32k.h.
Note that the new plat/counter-32k.h must not be
included from drivers, that will break omap2+ build
for CONFIG_MULTIPLATFORM.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index c925c805969f..426fcfcfd821 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -34,8 +34,6 @@ #include <asm/proc-fns.h> -#include "../plat-omap/common.h" - #include "i2c.h" #include "serial.h" @@ -345,5 +343,8 @@ struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); extern void omap_reserve(void); +struct omap_hwmod; +extern int omap_dss_reset(struct omap_hwmod *); + #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ |