ia64/xen-unstable

changeset 1950:b425bcf84138

bitkeeper revision 1.1108.1.33 (4107bf87E4lBKLx7JAr-R9pTBE8wMg)

cleanup
author cl349@freefall.cl.cam.ac.uk
date Wed Jul 28 15:00:23 2004 +0000 (2004-07-28)
parents f9ae44cc1373
children 5742d5f92711 99b89b7e112d
files linux-2.6.7-xen-sparse/arch/xen/Kconfig.drivers linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/Kconfig.drivers	Wed Jul 28 13:48:19 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/Kconfig.drivers	Wed Jul 28 15:00:23 2004 +0000
     1.3 @@ -65,6 +65,7 @@ config UNIX98_PTYS
     1.4  
     1.5  
     1.6  if XEN_PHYSDEV_ACCESS
     1.7 +source "drivers/i2c/Kconfig"
     1.8  source "drivers/video/Kconfig"
     1.9  endif
    1.10  
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Jul 28 13:48:19 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Jul 28 15:00:23 2004 +0000
     2.3 @@ -34,7 +34,6 @@ CONFIG_LOG_BUF_SHIFT=14
     2.4  # CONFIG_IKCONFIG is not set
     2.5  # CONFIG_EMBEDDED is not set
     2.6  CONFIG_KALLSYMS=y
     2.7 -# CONFIG_KALLSYMS_ALL is not set
     2.8  CONFIG_FUTEX=y
     2.9  CONFIG_EPOLL=y
    2.10  CONFIG_IOSCHED_NOOP=y
    2.11 @@ -109,11 +108,9 @@ CONFIG_HAVE_DEC_LOCK=y
    2.12  CONFIG_PCI=y
    2.13  # CONFIG_PCI_GOBIOS is not set
    2.14  # CONFIG_PCI_GOMMCONFIG is not set
    2.15 -# CONFIG_PCI_GODIRECT is not set
    2.16 -CONFIG_PCI_GOANY=y
    2.17 -CONFIG_PCI_BIOS=y
    2.18 +CONFIG_PCI_GODIRECT=y
    2.19 +# CONFIG_PCI_GOANY is not set
    2.20  CONFIG_PCI_DIRECT=y
    2.21 -CONFIG_PCI_MMCONFIG=y
    2.22  CONFIG_PCI_LEGACY_PROC=y
    2.23  # CONFIG_PCI_NAMES is not set
    2.24  CONFIG_ISA=y
    2.25 @@ -124,17 +121,10 @@ CONFIG_ISA=y
    2.26  #
    2.27  # Kernel hacking
    2.28  #
    2.29 -CONFIG_DEBUG_KERNEL=y
    2.30 +# CONFIG_DEBUG_KERNEL is not set
    2.31  CONFIG_EARLY_PRINTK=y
    2.32 -# CONFIG_DEBUG_STACKOVERFLOW is not set
    2.33 -# CONFIG_DEBUG_STACK_USAGE is not set
    2.34 -# CONFIG_DEBUG_SLAB is not set
    2.35 -# CONFIG_MAGIC_SYSRQ is not set
    2.36 -# CONFIG_DEBUG_SPINLOCK is not set
    2.37 -# CONFIG_DEBUG_PAGEALLOC is not set
    2.38 -CONFIG_DEBUG_INFO=y
    2.39  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    2.40 -CONFIG_FRAME_POINTER=y
    2.41 +# CONFIG_FRAME_POINTER is not set
    2.42  # CONFIG_4KSTACKS is not set
    2.43  CONFIG_X86_BIOS_REBOOT=y
    2.44  CONFIG_X86_STD_RESOURCES=y
    2.45 @@ -154,7 +144,6 @@ CONFIG_BINFMT_ELF=y
    2.46  #
    2.47  # Generic Driver Options
    2.48  #
    2.49 -# CONFIG_DEBUG_DRIVER is not set
    2.50  
    2.51  #
    2.52  # Block devices
    2.53 @@ -293,7 +282,7 @@ CONFIG_IP_PNP=y
    2.54  # CONFIG_INET_ESP is not set
    2.55  # CONFIG_INET_IPCOMP is not set
    2.56  # CONFIG_NETFILTER is not set
    2.57 -# CONFIG_BRIDGE is not set
    2.58 +CONFIG_BRIDGE=y
    2.59  # CONFIG_VLAN_8021Q is not set
    2.60  # CONFIG_DECNET is not set
    2.61  # CONFIG_LLC2 is not set
    2.62 @@ -332,7 +321,14 @@ CONFIG_NET_ETHERNET=y
    2.63  CONFIG_MII=y
    2.64  # CONFIG_HAPPYMEAL is not set
    2.65  # CONFIG_SUNGEM is not set
    2.66 -# CONFIG_NET_VENDOR_3COM is not set
    2.67 +CONFIG_NET_VENDOR_3COM=y
    2.68 +# CONFIG_EL1 is not set
    2.69 +# CONFIG_EL2 is not set
    2.70 +# CONFIG_ELPLUS is not set
    2.71 +# CONFIG_EL3 is not set
    2.72 +# CONFIG_3C515 is not set
    2.73 +CONFIG_VORTEX=y
    2.74 +# CONFIG_TYPHOON is not set
    2.75  # CONFIG_LANCE is not set
    2.76  # CONFIG_NET_VENDOR_SMC is not set
    2.77  # CONFIG_NET_VENDOR_RACAL is not set
    2.78 @@ -340,17 +336,47 @@ CONFIG_MII=y
    2.79  #
    2.80  # Tulip family network device support
    2.81  #
    2.82 -# CONFIG_NET_TULIP is not set
    2.83 +CONFIG_NET_TULIP=y
    2.84 +CONFIG_TULIP=y
    2.85 +# CONFIG_TULIP_MMIO is not set
    2.86 +# CONFIG_TULIP_NAPI is not set
    2.87 +# CONFIG_DE4X5 is not set
    2.88 +# CONFIG_WINBOND_840 is not set
    2.89 +# CONFIG_DM9102 is not set
    2.90  # CONFIG_DEPCA is not set
    2.91  # CONFIG_HP100 is not set
    2.92  # CONFIG_NET_ISA is not set
    2.93 -# CONFIG_NET_PCI is not set
    2.94 +CONFIG_NET_PCI=y
    2.95 +CONFIG_PCNET32=y
    2.96 +# CONFIG_AMD8111_ETH is not set
    2.97 +# CONFIG_ADAPTEC_STARFIRE is not set
    2.98 +# CONFIG_APRICOT is not set
    2.99 +# CONFIG_CS89x0 is not set
   2.100 +# CONFIG_DGRS is not set
   2.101 +# CONFIG_EEPRO100 is not set
   2.102 +CONFIG_E100=y
   2.103 +# CONFIG_E100_NAPI is not set
   2.104 +# CONFIG_FEALNX is not set
   2.105 +# CONFIG_NATSEMI is not set
   2.106 +# CONFIG_NE2K_PCI is not set
   2.107 +CONFIG_8139TOO=y
   2.108 +CONFIG_8139TOO_PIO=y
   2.109 +# CONFIG_8139TOO_TUNE_TWISTER is not set
   2.110 +# CONFIG_8139TOO_8129 is not set
   2.111 +# CONFIG_8139_OLD_RX_RESET is not set
   2.112 +# CONFIG_SIS900 is not set
   2.113 +# CONFIG_EPIC100 is not set
   2.114 +# CONFIG_SUNDANCE is not set
   2.115 +# CONFIG_TLAN is not set
   2.116 +CONFIG_VIA_RHINE=y
   2.117 +# CONFIG_VIA_RHINE_MMIO is not set
   2.118  # CONFIG_NET_POCKET is not set
   2.119  
   2.120  #
   2.121  # Ethernet (1000 Mbit)
   2.122  #
   2.123 -# CONFIG_ACENIC is not set
   2.124 +CONFIG_ACENIC=y
   2.125 +# CONFIG_ACENIC_OMIT_TIGON_I is not set
   2.126  # CONFIG_DL2K is not set
   2.127  CONFIG_E1000=y
   2.128  # CONFIG_E1000_NAPI is not set
   2.129 @@ -358,7 +384,7 @@ CONFIG_E1000=y
   2.130  # CONFIG_HAMACHI is not set
   2.131  # CONFIG_R8169 is not set
   2.132  # CONFIG_SK98LIN is not set
   2.133 -# CONFIG_TIGON3 is not set
   2.134 +CONFIG_TIGON3=y
   2.135  
   2.136  #
   2.137  # Ethernet (10000 Mbit)
   2.138 @@ -482,6 +508,11 @@ CONFIG_LEGACY_PTY_COUNT=256
   2.139  # CONFIG_HANGCHECK_TIMER is not set
   2.140  
   2.141  #
   2.142 +# I2C support
   2.143 +#
   2.144 +# CONFIG_I2C is not set
   2.145 +
   2.146 +#
   2.147  # Graphics support
   2.148  #
   2.149  # CONFIG_FB is not set
     3.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig	Wed Jul 28 13:48:19 2004 +0000
     3.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig	Wed Jul 28 15:00:23 2004 +0000
     3.3 @@ -703,12 +703,6 @@ config PCI_DIRECT
     3.4   	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
     3.5  	default y
     3.6  
     3.7 -config PCI_MMCONFIG
     3.8 -	bool
     3.9 -	depends on PCI && (PCI_GOMMCONFIG || PCI_GOANY)
    3.10 -	select ACPI_BOOT
    3.11 -	default y
    3.12 -
    3.13  source "drivers/pci/Kconfig"
    3.14  
    3.15  config ISA