Merge

diff --cc arch/i386/Makefile
index 128bac6d965bab49cc4752a8c196e040813ff0db,7a651915373f2f460f51893b5ca67acf87c3c31d..d2d87df667994670b8b8db562f5eebc236c71955
--- 1/arch/i386/Makefile
--- 2/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@@ -85,15 -85,35 +85,22 @@@ ifdef CONFIG_MCYRIXII
  CFLAGS += -march=i586
  endif
  
+ ifdef CONFIG_VISWS
+ MACHINE       := mach-visws
+ else
+ MACHINE       := mach-generic
+ endif
+ 
  HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
  
 -SUBDIRS += arch/i386/kernel arch/i386/mm arch/i386/lib \
 -              arch/i386/$(MACHINE)
 -
 -CORE_FILES := arch/i386/kernel/kernel.o arch/i386/mm/mm.o \
 -              arch/i386/$(MACHINE)/$(MACHINE).o $(CORE_FILES)
 -
 -LIBS := $(TOPDIR)/arch/i386/lib/lib.a $(LIBS) $(TOPDIR)/arch/i386/lib/lib.a
 +libs-y                                        += arch/i386/lib/
- 
- core-y                                        += arch/i386/kernel/ arch/i386/mm/
- 
++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/
  
 -ifdef CONFIG_MATH_EMULATION
 -SUBDIRS += arch/i386/math-emu
 -DRIVERS += arch/i386/math-emu/math.o
 -endif
 -
 -ifdef CONFIG_PCI
 -SUBDIRS       += arch/i386/pci
 -DRIVERS       += arch/i386/pci/pci.o
 -endif
 -
+ CFLAGS += -I$(TOPDIR)/arch/i386/$(MACHINE)
+ AFLAGS += -I$(TOPDIR)/arch/i386/$(MACHINE)
+ 
  MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot
  
  .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \

diff --cc arch/i386/kernel/Makefile
Simple merge

diff --cc arch/i386/kernel/mpparse.c
Simple merge

diff --cc arch/i386/pci/Makefile
index 623a4ab517e3567137e42d367a9ec0568e819fac,3d9297c69c1e98b31407936503002c954a99a61b..8c47e7235e171172f1168383af91e03829d4b02a
--- 1/arch/i386/pci/Makefile
--- 2/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@@ -1,9 -1,7 +1,5 @@@
 -O_TARGET        := pci.o
 -
  obj-y         := i386.o
  
- ifdef CONFIG_VISWS
- obj-y         += visws.o
- else
- 
  obj-$(CONFIG_PCI_BIOS)                += pcbios.o
  obj-$(CONFIG_PCI_DIRECT)      += direct.o
  

diff --cc fs/binfmt_elf.c
Simple merge