git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mn10300
/
kernel
/
mn10300-serial.c
diff --git
a/arch/mn10300/kernel/mn10300-serial.c
b/arch/mn10300/kernel/mn10300-serial.c
index 59b9c4bf9583a67e8e1467576d6e7fc49125eca7..2fd59664d00ab1b60cd782ab31d4647a559387d6 100644
(file)
--- a/
arch/mn10300/kernel/mn10300-serial.c
+++ b/
arch/mn10300/kernel/mn10300-serial.c
@@
-41,7
+41,7
@@
static const char serial_revdate[] = "2007-11-06";
#include <asm/irq.h>
#include <asm/bitops.h>
#include <asm/serial-regs.h>
-#include <
asm/
unit/timex.h>
+#include <unit/timex.h>
#include "mn10300-serial.h"
static inline __attribute__((format(printf, 1, 2)))