projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc
[cascardo/linux.git]
/
arch
/
arm
/
mach-shmobile
/
console.c
diff --git
a/arch/arm/mach-shmobile/console.c
b/arch/arm/mach-shmobile/console.c
index
9411a5b
..
f2e79f2
100644
(file)
--- a/
arch/arm/mach-shmobile/console.c
+++ b/
arch/arm/mach-shmobile/console.c
@@
-19,8
+19,8
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <mach/common.h>
#include <asm/mach/map.h>
+#include "common.h"
void __init shmobile_setup_console(void)
{