diff options
| author | Paul Walmsley <paul@pwsan.com> | 2009-01-28 12:27:31 -0700 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 17:50:38 +0000 |
| commit | f8de9b2c45c4506702da4bd3a5bc7630754077f9 (patch) | |
| tree | f375f808bfdc0ef8c83671aca66f3150b08e44e5 /arch/arm/mach-omap2/clock34xx.c | |
| parent | fed415e48f07799b278cd4353385fee1464d4aca (diff) | |
| download | linux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.tar.gz linux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.tar.bz2 linux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.zip | |
[ARM] OMAP2 SDRC: move mach-omap2/memory.h into mach/sdrc.h
Move the contents of the arch/arm/mach-omap2/memory.h file to the
existing mach/sdrc.h file, and remove memory.h. Modify files which
include memory.h to include asm/arch/sdrc.h instead.
linux-omap source commit is e7ae2d89921372fc4b9712a32cc401d645597807.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 3d756babb2f4..52385b1506e0 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -32,7 +32,7 @@ #include <asm/div64.h> #include <asm/clkdev.h> -#include "memory.h" +#include <mach/sdrc.h> #include "clock.h" #include "prm.h" #include "prm-regbits-34xx.h" |