summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 09:34:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 09:34:10 +0200
commitcd85b557414fe4cd44ea6608825e96612a5fe2b2 (patch)
tree8299d2bd75d4516b1c86aea06b296bdd3fcd2044 /include
parent04a8752485e450124f92c9b931d268b48d75650a (diff)
parentbc74ee976959616e3c1cc1341383bf2316dd4096 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Finally remove leftover markers sections m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC m68k/mac: Fix compiler warning in via_read_time() zorro: Fix four checkpatch warnings
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/vmlinux.lds.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index db22d136ad08..b5e2e4c6b017 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -222,7 +222,6 @@
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
*(__tracepoints_ptrs) /* Tracepoints: pointer array */\
VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \
- *(__markers_strings) /* Markers: strings */ \
*(__tracepoints_strings)/* Tracepoints: strings */ \
} \
\