3 files changed, 0 insertions, 49 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/acpi/hpet.asl b/src/mainboard/emulation/qemu-i440fx/acpi/hpet.asl
index 23bd6c1811..51e4f74267 100644
--- a/src/mainboard/emulation/qemu-i440fx/acpi/hpet.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/hpet.asl
@@ -26,9 +26,6 @@ Scope(\_SB) {
             Return (0x0F)
         }
         Name(_CRS, ResourceTemplate() {
-#if 0       /* This makes WinXP BSOD for not yet figured reasons. */
-            IRQNoFlags() {2, 8}
-#endif
             Memory32Fixed(ReadOnly,
                 0xFED00000,         // Address Base
                 0x00000400,         // Address Length
diff --git a/src/mainboard/emulation/qemu-i440fx/acpi/pci-crs.asl b/src/mainboard/emulation/qemu-i440fx/acpi/pci-crs.asl
index e94cce8524..b39c1e8316 100644
--- a/src/mainboard/emulation/qemu-i440fx/acpi/pci-crs.asl
+++ b/src/mainboard/emulation/qemu-i440fx/acpi/pci-crs.asl
@@ -58,39 +58,6 @@ Scope(\_SB.PCI0) {
     })
 
     Method(_CRS, 0) {
-#if 0
-        /* Fields provided by dynamically created ssdt */
-        External(P0S, IntObj)
-        External(P0E, IntObj)
-        External(P1V, IntObj)
-        External(P1S, BuffObj)
-        External(P1E, BuffObj)
-        External(P1L, BuffObj)
-
-        /* fixup 32bit pci io window */
-        CreateDWordField(CRES, \_SB.PCI0.PW32._MIN, PS32)
-        CreateDWordField(CRES, \_SB.PCI0.PW32._MAX, PE32)
-        CreateDWordField(CRES, \_SB.PCI0.PW32._LEN, PL32)
-        Store(P0S, PS32)
-        Store(P0E, PE32)
-        Store(Add(Subtract(P0E, P0S), 1), PL32)
-
-        If (LEqual(P1V, Zero)) {
-            Return (CRES)
-        }
-
-        /* fixup 64bit pci io window */
-        CreateQWordField(CR64, \_SB.PCI0.PW64._MIN, PS64)
-        CreateQWordField(CR64, \_SB.PCI0.PW64._MAX, PE64)
-        CreateQWordField(CR64, \_SB.PCI0.PW64._LEN, PL64)
-        Store(P1S, PS64)
-        Store(P1E, PE64)
-        Store(P1L, PL64)
-        /* add window and return result */
-        ConcatenateResTemplate(CRES, CR64, Local0)
-        Return (Local0)
-#else
         Return (CRES)
-#endif
     }
 }
diff --git a/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
index 8621a0a814..5a341b49f4 100644
--- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl
+++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
@@ -275,11 +275,6 @@ DefinitionBlock (
 		}
 	}
 
-#if 0
-#include "acpi/cpu-hotplug.asl"
-#endif
-
-
 /****************************************************************
  * General purpose events
  ****************************************************************/
@@ -290,16 +285,8 @@ DefinitionBlock (
 		Method(_L00) {
 		}
 		Method(_E01) {
-#if 0
-			// PCI hotplug event
-			\_SB.PCI0.PCNF()
-#endif
 		}
 		Method(_E02) {
-#if 0
-			// CPU hotplug event
-			\_SB.PRSC()
-#endif
 		}
 		Method(_L03) {
 		}