diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-27 17:11:15 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:58:54 -0700 |
| commit | e6a6e5ad17ee090f8d48a3b0758338a97124539f (patch) | |
| tree | 726d765671e35e6aa86745eb74bb1528febeda4e /arch/arm/plat-omap | |
| parent | 3a8761c0272c961c707e5af2eb0179adf3ef7e14 (diff) | |
| download | talos-obmc-linux-e6a6e5ad17ee090f8d48a3b0758338a97124539f.tar.gz talos-obmc-linux-e6a6e5ad17ee090f8d48a3b0758338a97124539f.zip | |
ARM: OMAP: Make plat/common.h local to mach-omap1 and mach-omap2
We cannot keep this in plat/common.h for common zImage support.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/common.h (renamed from arch/arm/plat-omap/include/plat/common.h) | 7 | ||||
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index b388e87b522b..2a9db0128a96 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -16,7 +16,7 @@ #include <linux/io.h> #include <linux/dma-mapping.h> -#include <plat/common.h> +#include "common.h" #include <plat/vram.h> #include <linux/platform_data/dsp-omap.h> #include <plat-omap/dma-omap.h> diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/common.h index 55c0f8bfc85b..e196d1300157 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/common.h @@ -1,7 +1,5 @@ /* - * arch/arm/plat-omap/include/mach/common.h - * - * Header for code common to all OMAP machines. + * Header for shared OMAP code in plat-omap. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -27,13 +25,12 @@ #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H #define __ARCH_ARM_MACH_OMAP_COMMON_H -#include <plat/omap_hwmod.h> - extern int __init omap_init_clocksource_32k(void __iomem *vbase); extern void __init omap_check_revision(void); extern void omap_reserve(void); +struct omap_hwmod; extern int omap_dss_reset(struct omap_hwmod *); void omap_sram_init(void); diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 87ba8dd0d791..8e847de4c744 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -22,7 +22,7 @@ #include <asm/mach/time.h> #include <asm/sched_clock.h> -#include <plat/common.h> +#include "common.h" #include <plat/clock.h> /* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */ |
