correct mistaken push of experimental msix stuff, etc.

Reference: /n/atom/patch/applied/nixtermcfg2
Date: Mon Jun  9 23:45:38 CES 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/nix/k10/cpu	Mon Jun  9 23:45:38 2014
+++ /sys/src/nix/k10/cpu	Mon Jun  9 23:45:38 2014
@@ -16,7 +16,7 @@
 	kprof
 #	segment
 	acpi
-	ws2
+	ws
 
 	ether		netif
 	cec
@@ -46,8 +46,7 @@
 
 	ether8169	pci ethermii
 #	ether82557	pci
-#	ether82563	pci
-	ether82563x	pci
+	ether82563	pci
 	etherbcm	pci ethermii
 	etherigbe	pci ethermii
 
@@ -57,8 +56,6 @@
 
 	etheri40		pci
 
-	etherusb
-
 	ethermedium
 #	must have for venti (please fix venti)
 	loopbackmedium
@@ -74,12 +71,11 @@
 	sdodin		sdscsifis sdatafis
 	sdvanir		sdscsifis sdatafis
 	sdmpt2		sdscsifis sdatafis
-	sdvirtio		sdscsi
 	sdloop
 
 misc +dev
-#	mp		mpacpi lapic ioapic msi msix pci sipi
-	acpi		acpiio lapic ioapic msi msix pci sipi
+#	mp		mpacpi lapic ioapic msi pci sipi
+	acpi		acpiio lapic ioapic msi pci sipi
 
 boot cpu
 	il
@@ -97,6 +93,8 @@
 	apic		'A'
 	arch		'V'
 	devacpi		'C'
+	acpi		'C'
+	acpiio		'C'
 	devsegment	'z'
 	hpet		'H'
 	image		'p'
--- /sys/src/nix/k10/term	Mon Jun  9 23:45:38 2014
+++ /sys/src/nix/k10/term	Mon Jun  9 23:45:38 2014
@@ -17,7 +17,7 @@
 #	segment
 	acpi
 	audio
-	ws2
+	ws
 
 	ether		netif
 	cec
@@ -87,7 +87,7 @@
 
 misc +dev
 #	mp		mpacpi lapic ioapic msi pci sipi
-	acpi		acpiio lapic ioapic msi msix pci sipi
+	acpi		acpiio lapic ioapic msi pci sipi
 
 boot terminal
 	il