diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/arm/mm/proc-v6.S | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
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/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index f0cc599facb7..087e239704df 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * | 10 | * |
| 11 | * This is the "shell" of the ARMv6 processor support. | 11 | * This is the "shell" of the ARMv6 processor support. |
| 12 | */ | 12 | */ |
| 13 | #include <linux/init.h> | ||
| 13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 14 | #include <asm/assembler.h> | 15 | #include <asm/assembler.h> |
| 15 | #include <asm/asm-offsets.h> | 16 | #include <asm/asm-offsets.h> |
| @@ -132,7 +133,7 @@ cpu_v6_name: | |||
| 132 | .asciz "ARMv6-compatible processor" | 133 | .asciz "ARMv6-compatible processor" |
| 133 | .align | 134 | .align |
| 134 | 135 | ||
| 135 | .section ".text.init", #alloc, #execinstr | 136 | __INIT |
| 136 | 137 | ||
| 137 | /* | 138 | /* |
| 138 | * __v6_setup | 139 | * __v6_setup |