diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /arch/mn10300/kernel/head.S | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/mn10300/kernel/head.S')
| -rw-r--r-- | arch/mn10300/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/head.S b/arch/mn10300/kernel/head.S index 606bd8c6758d..8a8309fbe3c4 100644 --- a/arch/mn10300/kernel/head.S +++ b/arch/mn10300/kernel/head.S | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
| 18 | #include <asm/frame.inc> | 18 | #include <asm/frame.inc> |
| 19 | #include <asm/param.h> | 19 | #include <asm/param.h> |
| 20 | #include <asm/unit/serial.h> | 20 | #include <unit/serial.h> |
| 21 | 21 | ||
| 22 | .section .text.head,"ax" | 22 | .section .text.head,"ax" |
| 23 | 23 | ||