ia64/xen-unstable

changeset 9645:1c03c45d0c06

fix x86_32 default linux builds
author ack@kneesa.uk.xensource.com
date Mon Apr 10 10:57:38 2006 +0100 (2006-04-10)
parents 81bc9e9fb40d
children b765c96f8127
files buildconfigs/linux-defconfig_xen0_x86_64 buildconfigs/linux-defconfig_xen_x86_64
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64	Sun Apr 09 18:23:16 2006 +0100
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64	Mon Apr 10 10:57:38 2006 +0100
     1.3 @@ -381,6 +381,7 @@ CONFIG_BLK_DEV_IDECD=y
     1.4  #
     1.5  CONFIG_IDE_GENERIC=y
     1.6  # CONFIG_BLK_DEV_CMD640 is not set
     1.7 +# CONFIG_BLK_DEV_IDEPNP is not set
     1.8  CONFIG_BLK_DEV_IDEPCI=y
     1.9  # CONFIG_IDEPCI_SHARE_IRQ is not set
    1.10  # CONFIG_BLK_DEV_OFFBOARD is not set
    1.11 @@ -565,6 +566,7 @@ CONFIG_NETDEVICES=y
    1.12  # CONFIG_BONDING is not set
    1.13  # CONFIG_EQUALIZER is not set
    1.14  CONFIG_TUN=y
    1.15 +# CONFIG_NET_SB1000 is not set
    1.16  
    1.17  #
    1.18  # ARCnet devices
     2.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Sun Apr 09 18:23:16 2006 +0100
     2.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Mon Apr 10 10:57:38 2006 +0100
     2.3 @@ -863,6 +863,7 @@ CONFIG_BLK_DEV_IDESCSI=m
     2.4  CONFIG_IDE_GENERIC=y
     2.5  CONFIG_BLK_DEV_CMD640=y
     2.6  CONFIG_BLK_DEV_CMD640_ENHANCED=y
     2.7 +CONFIG_BLK_DEV_IDEPNP=y
     2.8  CONFIG_BLK_DEV_IDEPCI=y
     2.9  CONFIG_IDEPCI_SHARE_IRQ=y
    2.10  # CONFIG_BLK_DEV_OFFBOARD is not set
    2.11 @@ -1094,6 +1095,7 @@ CONFIG_DUMMY=m
    2.12  CONFIG_BONDING=m
    2.13  CONFIG_EQUALIZER=m
    2.14  CONFIG_TUN=m
    2.15 +CONFIG_NET_SB1000=m
    2.16  
    2.17  #
    2.18  # ARCnet devices