Fix up some merge issues for the Makefle changes in the arch-splitup

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index d2d87df667994670b8b8db562f5eebc236c71955..fe7fdd87efd4e0fcf24ba0c840a2a58d1d204e89 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -94,7 +94,7 @@ endif
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
 
 libs-y                                         += arch/i386/lib/
-core-y                                 += arch/i386/kernel/ arch/i386/mm/ arch/i386/(MACHINE)/
+core-y                                 += arch/i386/kernel/ arch/i386/mm/ arch/i386/$(MACHINE)/
 drivers-$(CONFIG_MATH_EMULATION)       += arch/i386/math-emu/
 drivers-$(CONFIG_PCI)                  += arch/i386/pci/
 

diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile
index 72337b22c87e4650b465fc228b28b05d4f3d52b9..df1afec2bac42a4888895b2de5f031ecfca84cee 100644 (file)
--- a/arch/i386/mach-generic/Makefile
+++ b/arch/i386/mach-generic/Makefile
@@ -7,12 +7,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-       $(CC) $(AFLAGS) -traditional -c $< -o $*.o
-
-all: mach-generic.o
-
-O_TARGET       := mach-generic.o
 EXTRA_CFLAGS   += -I../kernel
 export-objs     :=