Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / arch / m68k / kernel / vmlinux.lds.S

diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S
index 497b924f3c86c3df14b9b25bb2253c36ec5bb72c..99ba315bd0a857a884dd017fc7a3c42027b78879 100644 (file)
--- 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);