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

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/
 

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     :=