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-omap1 | |
| 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-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/timer32k.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h index 3d40f6ea3485..fc8c9449eba8 100644 --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -26,7 +26,6 @@ #ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H #define __ARCH_ARM_MACH_OMAP1_COMMON_H -#include "../plat-omap/common.h" #include <linux/mtd/mtd.h> #include <linux/i2c-omap.h> diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 74529549130c..89368195bf08 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -50,6 +50,7 @@ #include <asm/mach/irq.h> #include <asm/mach/time.h> +#include <plat/counter-32k.h> #include <plat/dmtimer.h> #include <mach/hardware.h> |