Merge Linux 2.6.23

[~andy/linux] / arch / m32r / Makefile

diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile
index 4b3c90ba926c7024108c4972680550126c03217e..60e12f3126544b90faeef1048b8161df2c46c9bd 100644 (file)
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
@@ -1,10 +1,13 @@
 #
 # m32r/Makefile
 #
+# This file is included by the global makefile so that you can add your own
+# architecture-specific flags and dependencies.
+#
 
 LDFLAGS                :=
 OBJCOPYFLAGS   := -O binary -R .note -R .comment -S
-LDFLAGS_vmlinux        := -e startup_32
+LDFLAGS_vmlinux        :=
 
 CFLAGS += -pipe -fno-schedule-insns
 CFLAGS_KERNEL += -mmodel=medium
@@ -33,13 +36,14 @@ LIBGCC      := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 libs-y += arch/m32r/lib/ $(LIBGCC)
 core-y += arch/m32r/kernel/    \
           arch/m32r/mm/        \
-          arch/m32r/boot/
+          arch/m32r/boot/      \
+          arch/m32r/platforms/
 
 drivers-$(CONFIG_OPROFILE)     += arch/m32r/oprofile/
 
 boot := arch/m32r/boot
 
-.PHONY: zImage
+PHONY += zImage
 
 all: zImage