diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 10:01:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 10:01:49 -0700 |
| commit | d848223808c5d21e1b3cea090047e34722c6254b (patch) | |
| tree | a869974378be9c20f311ad3d934eb3946e813a1a /arch/mn10300/kernel/mn10300-serial.c | |
| parent | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff) | |
| parent | 2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
Separate out the proc- and unit-specific header directories from the general
Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
Diffstat (limited to 'arch/mn10300/kernel/mn10300-serial.c')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index 59b9c4bf958..2fd59664d00 100644 --- 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))) |