Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / sparc64 / prom / Makefile

diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile
index c7898a5ee456ba0838afb6fc567551fdde3489b1..3d33ed27bc27b2bb0a98a374c657e99f5e3dc5ad 100644 (file)
--- a/arch/sparc64/prom/Makefile
+++ b/arch/sparc64/prom/Makefile
@@ -6,5 +6,5 @@
 EXTRA_AFLAGS := -ansi
 EXTRA_CFLAGS := -Werror
 
-lib-y   := bootstr.o devops.o init.o memory.o misc.o \
+lib-y   := bootstr.o devops.o init.o misc.o \
           tree.o console.o printf.o p1275.o cif.o