From 3e6ece13d966a20a38ee7adfac452a47455ccd7a Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Wed, 17 Oct 2012 00:46:45 +0000 Subject: ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h Remove arch/arm/plat-omap/include/plat/sdrc.h by folding its contents into arch/arm/mach-omap2/sdrc.h. The objective is to assist Tony in cleaning out arch/arm/plat-omap/, as his upstreams request. Signed-off-by: Paul Walmsley Cc: Tony Lindgren [tony@atomide.com: updated to remove rotate macros] Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/sdram-nokia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/sdram-nokia.c') diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c index 845c4fd2b125..5e5702cd410d 100644 --- a/arch/arm/mach-omap2/sdram-nokia.c +++ b/arch/arm/mach-omap2/sdram-nokia.c @@ -19,9 +19,9 @@ #include "common.h" #include -#include #include "sdram-nokia.h" +#include "sdrc.h" /* In picoseconds, except for tREF (ns), tXP, tCKE, tWTR (clks) */ struct sdram_timings { -- cgit v1.2.3 From a135eaae524acba1509a3b19c97fae556e4da7cd Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 27 Sep 2012 10:33:34 -0600 Subject: ARM: OMAP: remove plat/clock.h Remove arch/arm/plat-omap/include/plat/clock.h by merging it into arch/arm/mach-omap1/clock.h and arch/arm/mach-omap2/clock.h. The goal here is to facilitate ARM single image kernels by removing includes via the "plat/" symlink. Signed-off-by: Paul Walmsley [tony@atomide.com: fixed to remove duplicate clock.h includes] Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/sdram-nokia.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/mach-omap2/sdram-nokia.c') diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c index 5e5702cd410d..0fa7ffa9b5ed 100644 --- a/arch/arm/mach-omap2/sdram-nokia.c +++ b/arch/arm/mach-omap2/sdram-nokia.c @@ -18,8 +18,6 @@ #include #include "common.h" -#include - #include "sdram-nokia.h" #include "sdrc.h" -- cgit v1.2.3