diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 16:35:09 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 16:35:09 +0000 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /arch/arm/mach-omap2/sdrc2xxx.c | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
| download | blackbird-op-linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.tar.gz blackbird-op-linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-omap2/sdrc2xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/sdrc2xxx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c index feaec7eaf6bd..0f4d27aef44d 100644 --- a/arch/arm/mach-omap2/sdrc2xxx.c +++ b/arch/arm/mach-omap2/sdrc2xxx.c @@ -24,13 +24,13 @@ #include <linux/clk.h> #include <linux/io.h> -#include <mach/common.h> -#include <mach/clock.h> -#include <mach/sram.h> +#include <plat/common.h> +#include <plat/clock.h> +#include <plat/sram.h> #include "prm.h" #include "clock.h" -#include <mach/sdrc.h> +#include <plat/sdrc.h> #include "sdrc.h" /* Memory timing, DLL mode flags */ |
