1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/Kconfig	Fri Jan 21 23:28:40 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/Kconfig	Sat Jan 22 17:10:17 2005 +0000
     1.3 @@ -32,8 +32,7 @@ config XEN_PRIVILEGED_GUEST
     1.4  
     1.5  config XEN_PHYSDEV_ACCESS
     1.6  	bool "Physical device access"
     1.7 -	default y if XEN_PRIVILEGED_GUEST
     1.8 -	default n if !XEN_PRIVILEGED_GUEST
     1.9 +	default XEN_PRIVILEGED_GUEST
    1.10  	help
    1.11  	  Assume access is available to physical hardware devices
    1.12            (e.g., hard drives, network cards). This allows you to configure
    1.13 @@ -42,8 +41,8 @@ config XEN_PHYSDEV_ACCESS
    1.14  
    1.15  config XEN_BLKDEV_BACKEND
    1.16          bool "Block-device backend driver"
    1.17 -        default y if XEN_PHYSDEV_ACCESS
    1.18 -        default n if !XEN_PHYSDEV_ACCESS
    1.19 +      depends on XEN_PHYSDEV_ACCESS
    1.20 +        default y
    1.21          help
    1.22            The block-device backend driver allows the kernel to export its
    1.23            block devices to other guests via a high-performance shared-memory
    1.24 @@ -51,8 +50,8 @@ config XEN_BLKDEV_BACKEND
    1.25  
    1.26  config XEN_NETDEV_BACKEND
    1.27          bool "Network-device backend driver"
    1.28 -        default y if XEN_PHYSDEV_ACCESS
    1.29 -        default n if !XEN_PHYSDEV_ACCESS
    1.30 +      depends on XEN_PHYSDEV_ACCESS
    1.31 +        default y
    1.32          help
    1.33            The network-device backend driver allows the kernel to export its
    1.34            network devices to other guests via a high-performance shared-memory
    1.35 @@ -76,9 +75,9 @@ config XEN_NETDEV_FRONTEND
    1.36            dedicated device-driver domain, or your master control domain
    1.37            (domain 0), then you almost certainly want to say Y here.
    1.38  
    1.39 -if XEN_NETDEV_FRONTEND
    1.40  config XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER
    1.41          bool "Pipelined transmitter (DANGEROUS)"
    1.42 +	depends on XEN_NETDEV_FRONTEND
    1.43          default n
    1.44          help
    1.45            The driver will assume that the backend is pipelining packets for
    1.46 @@ -92,7 +91,6 @@ config XEN_NETDEV_FRONTEND_PIPELINED_TRA
    1.47            like reassembling packets to perform firewall filtering; or if you
    1.48            are unsure; or if you experience network hangs when this option is
    1.49            enabled; then you must say N here.
    1.50 -endif
    1.51  
    1.52  config XEN_WRITABLE_PAGETABLES
    1.53  	bool
    1.54 @@ -109,40 +107,28 @@ config XEN_SCRUB_PAGES
    1.55            If security is not a concern then you may increase performance by
    1.56            saying N.
    1.57  
    1.58 +choice
    1.59 +        prompt "Processor Type"
    1.60 +        default X86
    1.61 +
    1.62 +config X86
    1.63 +        bool "X86"
    1.64 +        help
    1.65 +          Choose this option if your computer is a X86 architecture.
    1.66 +
    1.67 +config X86_64
    1.68 +        bool "X86_64"
    1.69 +        help
    1.70 +          Choose this option if your computer is a X86 architecture.
    1.71 +
    1.72 +endchoice
    1.73 +
    1.74  endmenu
    1.75  
    1.76  config HAVE_ARCH_DEV_ALLOC_SKB
    1.77  	bool
    1.78  	default y
    1.79  
    1.80 -#config VT
    1.81 -#	bool
    1.82 -#	default y
    1.83 -
    1.84 -#config VT_CONSOLE
    1.85 -#	bool
    1.86 -#	default y
    1.87 -
    1.88 -#config HW_CONSOLE
    1.89 -#	bool
    1.90 -#	default y
    1.91 -
    1.92 -choice
    1.93 -	prompt "Processor Type"
    1.94 -	default X86
    1.95 -
    1.96 -config X86
    1.97 -	bool "X86"
    1.98 -	help
    1.99 -	  Choose this option if your computer is a X86 architecture.
   1.100 -
   1.101 -config X86_64
   1.102 -	bool "X86_64"
   1.103 -	help
   1.104 -	  Choose this option if your computer is a X86 architecture.
   1.105 -
   1.106 -endchoice
   1.107 -
   1.108  source "init/Kconfig"
   1.109  
   1.110  if X86