diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/asm-generic/vmlinux.lds.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 83e2c31e8b00..bc2121fa9132 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -473,6 +473,7 @@ | |||
| 473 | #define KERNEL_CTORS() . = ALIGN(8); \ | 473 | #define KERNEL_CTORS() . = ALIGN(8); \ |
| 474 | VMLINUX_SYMBOL(__ctors_start) = .; \ | 474 | VMLINUX_SYMBOL(__ctors_start) = .; \ |
| 475 | *(.ctors) \ | 475 | *(.ctors) \ |
| 476 | *(.init_array) \ | ||
| 476 | VMLINUX_SYMBOL(__ctors_end) = .; | 477 | VMLINUX_SYMBOL(__ctors_end) = .; |
| 477 | #else | 478 | #else |
| 478 | #define KERNEL_CTORS() | 479 | #define KERNEL_CTORS() |