diff options
| author | Paul Walmsley | 2012-10-17 02:46:45 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2012-10-17 19:18:37 +0200 |
| commit | 3e6ece13d966a20a38ee7adfac452a47455ccd7a (patch) | |
| tree | 8ff651fcc0ee921e899caa969700f0024568021f /arch/arm/mach-omap2/control.c | |
| parent | Merge remote-tracking branch 'tomi/3.8/vrfb-conversion' into omap-for-v3.8/cl... (diff) | |
| download | kernel-qcow2-linux-3e6ece13d966a20a38ee7adfac452a47455ccd7a.tar.gz kernel-qcow2-linux-3e6ece13d966a20a38ee7adfac452a47455ccd7a.tar.xz kernel-qcow2-linux-3e6ece13d966a20a38ee7adfac452a47455ccd7a.zip | |
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 <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
[tony@atomide.com: updated to remove rotate macros]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index d1ff8399a222..bf2be5c5468d 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -1,7 +1,7 @@ /* * OMAP2/3 System Control Module register access * - * Copyright (C) 2007 Texas Instruments, Inc. + * Copyright (C) 2007, 2012 Texas Instruments, Inc. * Copyright (C) 2007 Nokia Corporation * * Written by Paul Walmsley @@ -15,8 +15,6 @@ #include <linux/kernel.h> #include <linux/io.h> -#include <plat/sdrc.h> - #include "soc.h" #include "iomap.h" #include "common.h" |