diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /arch/arm/mach-omap2/control.c | |
| parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * OMAP2/3 System Control Module register access | 2 | * OMAP2/3 System Control Module register access |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007 Texas Instruments, Inc. | 4 | * Copyright (C) 2007, 2012 Texas Instruments, Inc. |
| 5 | * Copyright (C) 2007 Nokia Corporation | 5 | * Copyright (C) 2007 Nokia Corporation |
| 6 | * | 6 | * |
| 7 | * Written by Paul Walmsley | 7 | * Written by Paul Walmsley |
| @@ -15,8 +15,6 @@ | |||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | 17 | ||
| 18 | #include <plat/sdrc.h> | ||
| 19 | |||
| 20 | #include "soc.h" | 18 | #include "soc.h" |
| 21 | #include "iomap.h" | 19 | #include "iomap.h" |
| 22 | #include "common.h" | 20 | #include "common.h" |