diff -urN linux-2.4.27-pre3-pciexpress/arch/i386/config.in linux-2.4.27-pre3-pciexpress-fix/arch/i386/config.in
--- linux-2.4.27-pre3-pciexpress/arch/i386/config.in	Sun May 30 16:35:16 2004
+++ linux-2.4.27-pre3-pciexpress-fix/arch/i386/config.in	Sun May 30 16:43:01 2004
@@ -283,20 +283,10 @@
    fi
    bool 'PCI support' CONFIG_PCI
    if [ "$CONFIG_PCI" = "y" ]; then
-      choice '  PCI access mode' \
-	"BIOS		CONFIG_PCI_GOBIOS	\
-	 Direct		CONFIG_PCI_GODIRECT	\
-	 MMConfig 	CONFIG_PCI_GOMMCONFIG	\
-	 Any		CONFIG_PCI_GOANY"	Any
-      if [ "$CONFIG_PCI_GOBIOS" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
-         define_bool CONFIG_PCI_BIOS y
-      fi
-      if [ "$CONFIG_PCI_GODIRECT" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
-         define_bool CONFIG_PCI_DIRECT y
-      fi
-      if [ "$CONFIG_PCI_GOMMCONFIG" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
-         define_bool CONFIG_PCI_MMCONFIG y
-      fi
+      comment  '  PCI access mode'
+      bool     '  BIOS' CONFIG_PCI_BIOS
+      bool     '  Direct' CONFIG_PCI_DIRECT
+      dep_bool '  MMConfig' CONFIG_PCI_MMCONFIG $CONFIG_ACPI
    fi
    bool 'ISA bus support' CONFIG_ISA
 fi