1.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/Kconfig	Thu Oct 07 16:30:38 2004 +0000
     1.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/Kconfig	Fri Oct 08 14:08:29 2004 +0000
     1.3 @@ -666,47 +666,52 @@ config PCI
     1.4  	  information about which PCI hardware does work under Linux and which
     1.5  	  doesn't.
     1.6  
     1.7 -choice
     1.8 -	prompt "PCI access mode"
     1.9 -	depends on PCI && !X86_VISWS
    1.10 -	default PCI_GOANY
    1.11 -	---help---
    1.12 -	  On PCI systems, the BIOS can be used to detect the PCI devices and
    1.13 -	  determine their configuration. However, some old PCI motherboards
    1.14 -	  have BIOS bugs and may crash if this is done. Also, some embedded
    1.15 -	  PCI-based systems don't have any BIOS at all. Linux can also try to
    1.16 -	  detect the PCI hardware directly without using the BIOS.
    1.17 -
    1.18 -	  With this option, you can specify how Linux should detect the
    1.19 -	  PCI devices. If you choose "BIOS", the BIOS will be used,
    1.20 -	  if you choose "Direct", the BIOS won't be used, and if you
    1.21 -	  choose "MMConfig", then PCI Express MMCONFIG will be used.
    1.22 -	  If you choose "Any", the kernel will try MMCONFIG, then the
    1.23 -	  direct access method and falls back to the BIOS if that doesn't
    1.24 -	  work. If unsure, go with the default, which is "Any".
    1.25 -
    1.26 -config PCI_GOBIOS
    1.27 -	bool "BIOS"
    1.28 -
    1.29 -config PCI_GOMMCONFIG
    1.30 -	bool "MMConfig"
    1.31 -
    1.32 -config PCI_GODIRECT
    1.33 -	bool "Direct"
    1.34 -
    1.35 -config PCI_GOANY
    1.36 -	bool "Any"
    1.37 -
    1.38 -endchoice
    1.39 -
    1.40 -config PCI_BIOS
    1.41 -	bool
    1.42 -	depends on !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY)
    1.43 -	default y
    1.44 +#choice
    1.45 +#	prompt "PCI access mode"
    1.46 +#	depends on PCI && !X86_VISWS
    1.47 +#	default PCI_GOANY
    1.48 +#	---help---
    1.49 +#	  On PCI systems, the BIOS can be used to detect the PCI devices and
    1.50 +#	  determine their configuration. However, some old PCI motherboards
    1.51 +#	  have BIOS bugs and may crash if this is done. Also, some embedded
    1.52 +#	  PCI-based systems don't have any BIOS at all. Linux can also try to
    1.53 +#	  detect the PCI hardware directly without using the BIOS.
    1.54 +#
    1.55 +#	  With this option, you can specify how Linux should detect the
    1.56 +#	  PCI devices. If you choose "BIOS", the BIOS will be used,
    1.57 +#	  if you choose "Direct", the BIOS won't be used, and if you
    1.58 +#	  choose "MMConfig", then PCI Express MMCONFIG will be used.
    1.59 +#	  If you choose "Any", the kernel will try MMCONFIG, then the
    1.60 +#	  direct access method and falls back to the BIOS if that doesn't
    1.61 +#	  work. If unsure, go with the default, which is "Any".
    1.62 +#
    1.63 +#config PCI_GOBIOS
    1.64 +#	bool "BIOS"
    1.65 +#
    1.66 +#config PCI_GOMMCONFIG
    1.67 +#	bool "MMConfig"
    1.68 +#
    1.69 +#config PCI_GODIRECT
    1.70 +#	bool "Direct"
    1.71 +#
    1.72 +#config PCI_GOANY
    1.73 +#	bool "Any"
    1.74 +#
    1.75 +#endchoice
    1.76 +#
    1.77 +#config PCI_BIOS
    1.78 +#	bool
    1.79 +#	depends on !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY)
    1.80 +#	default y
    1.81 +#
    1.82 +#config PCI_DIRECT
    1.83 +#	bool
    1.84 +# 	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
    1.85 +#	default y
    1.86  
    1.87  config PCI_DIRECT
    1.88  	bool
    1.89 - 	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
    1.90 + 	depends on PCI
    1.91  	default y
    1.92  
    1.93  source "drivers/pci/Kconfig"