Merged the ALi M1217 into the M6117 (that's based on the M1217), moved the M6117 out of the Dev branch, removed the broken M6117 Acrosser, and added three M1217 machines. This finishes the ALi work.

src/win/Makefile.mingw

@@ -75,9 +75,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef SIO_DETECT
   SIO_DETECT	:= y
  endif
- ifndef M6117
-  M6117		:= y
- endif
  ifndef VGAWONDER
   VGAWONDER	:= y
  endif
@@ -145,9 +142,6 @@ else
  ifndef SIO_DETECT
   SIO_DETECT	:= n
  endif
- ifndef M6117
-  M6117		:= n
- endif
  ifndef VGAWONDER
   VGAWONDER	:= n
  endif
@@ -551,11 +545,6 @@ OPTS		+= -DUSE_SIO_DETECT
 DEVBROBJ	+= sio_detect.o
 endif
 
-ifeq ($(M6117), y)
-OPTS		+= -DUSE_M6117
-DEVBROBJ	+= ali6117.o
-endif
-
 ifeq ($(VGAWONDER), y)
 OPTS		+= -DUSE_VGAWONDER
 endif
@@ -602,7 +591,7 @@ CPUOBJ		:= cpu.o cpu_table.o fpu.o x86.o \
 CHIPSETOBJ	:= acc2168.o \
 		    contaq_82c59x.o \
 		    cs4031.o cs8230.o \
-		    ali1217.o ali1429.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o \
+		    ali1429.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o ali6117.o \
 		    gc100.o headland.o \
 		    intel_82335.o intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \
 		    neat.o \