diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 04:49:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 04:49:47 -0500 |
| commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
| tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-omap2/board-am3517crane.c | |
| parent | e879c862fb81b986095ae7a4676b2281c2f97957 (diff) | |
| parent | 3f1517a761905c55d1db71cb0afd359d74a76a6c (diff) | |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517crane.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517crane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 7834536ab416..25704759d241 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
| 28 | 28 | ||
| 29 | #include <plat/board.h> | 29 | #include <plat/board.h> |
| 30 | #include <plat/common.h> | 30 | #include "common.h" |
| 31 | #include <plat/usb.h> | 31 | #include <plat/usb.h> |
| 32 | 32 | ||
| 33 | #include "mux.h" | 33 | #include "mux.h" |