summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 13:49:45 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 13:49:45 -0400
commit026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch)
tree2624a44924c625c367f3cebf937853b9da2de282 /arch/m68k/kernel/vmlinux.lds.S
parent9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff)
parent29454dde27d8e340bb1987bad9aa504af7081eba (diff)
downloadblackbird-op-linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.gz
blackbird-op-linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/m68k/kernel/vmlinux.lds.S')
-rw-r--r--arch/m68k/kernel/vmlinux.lds.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S
index 497b924f3c86..99ba315bd0a8 100644
--- a/arch/m68k/kernel/vmlinux.lds.S
+++ b/arch/m68k/kernel/vmlinux.lds.S
@@ -1,4 +1,3 @@
-#include <linux/config.h>
PHDRS
{
text PT_LOAD FILEHDR PHDRS FLAGS (7);
OpenPOWER on IntegriCloud