diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 06:08:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 06:08:20 +0200 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/mn10300/kernel/head.S | |
| parent | The patch adds support for the PCI cards: PCIcan and PCIcanx (1, 2 or 4 chann... (diff) | |
| parent | pkt_sched: gen_estimator: use 64 bit intermediate counters for bps (diff) | |
| download | linux-bb803cfbecb03a0cf8dc7e1864f18dda6631af00.tar.xz linux-bb803cfbecb03a0cf8dc7e1864f18dda6631af00.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/mn10300/kernel/head.S')
| -rw-r--r-- | arch/mn10300/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/head.S b/arch/mn10300/kernel/head.S index 8a8309fbe3c4..14f27f3bfaf4 100644 --- a/arch/mn10300/kernel/head.S +++ b/arch/mn10300/kernel/head.S @@ -9,6 +9,7 @@ * 2 of the Licence, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <linux/serial_reg.h> @@ -19,7 +20,7 @@ #include <asm/param.h> #include <unit/serial.h> - .section .text.head,"ax" + __HEAD ############################################################################### # |