diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-05 13:25:59 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 16:23:46 -0700 |
| commit | e4c060db2c13f10de09101afc564763f9fd0019a (patch) | |
| tree | 48a3ea5484e3fc9e485d7bb1b0e3d8795c67d368 /arch/arm/plat-omap/dma.c | |
| parent | e10dd62ffcb2953f80a4ea6ac53cb489ebfe0a79 (diff) | |
| download | talos-op-linux-e4c060db2c13f10de09101afc564763f9fd0019a.tar.gz talos-op-linux-e4c060db2c13f10de09101afc564763f9fd0019a.zip | |
ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2
We want to remove plat/cpu.h. To do this, let's first split
it to private soc.h to mach-omap1 and mach-omap2. We have to
keep plat/cpu.h around until the remaining drivers are fixed,
so let's include the local soc.h in plat/cpu.h and for drivers
still including plat/cpu.h.
Once the drivers are fixed not to include plat/cpu.h, we
can remove the file.
This is needed for the ARM common zImage support.
[tony@atomide.com: updated to not print a warning]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index b4dcd92a5845..49803cc18787 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -36,9 +36,11 @@ #include <linux/slab.h> #include <linux/delay.h> -#include <plat/cpu.h> #include <plat-omap/dma-omap.h> +#include "../mach-omap1/soc.h" +#include "../mach-omap2/soc.h" + /* * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA * channels that an instance of the SDMA IP block can support. Used |
