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 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
serial
/
imx.c
diff --git
a/drivers/serial/imx.c
b/drivers/serial/imx.c
index
e0da4dc
..
6a29f93
100644
(file)
--- a/
drivers/serial/imx.c
+++ b/
drivers/serial/imx.c
@@
-44,8
+44,8
@@
#include <asm/io.h>
#include <asm/irq.h>
-#include <
asm
/hardware.h>
-#include <
asm/ar
ch/imx-uart.h>
+#include <
mach
/hardware.h>
+#include <
ma
ch/imx-uart.h>
/* Register definitions */
#define URXD0 0x0 /* Receiver Register */