git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx2
/
serial.c
diff --git
a/arch/arm/mach-mx2/serial.c
b/arch/arm/mach-mx2/serial.c
index
570c02b
..
e31fd44
100644
(file)
--- a/
arch/arm/mach-mx2/serial.c
+++ b/
arch/arm/mach-mx2/serial.c
@@
-20,8
+20,8
@@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/serial.h>
-#include <
asm
/hardware.h>
-#include <
asm/ar
ch/imx-uart.h>
+#include <
mach
/hardware.h>
+#include <
ma
ch/imx-uart.h>
static struct resource uart0[] = {
{