diff options
| author | Christian Limpach <Christian.Limpach@xensource.com> | 2007-01-19 14:48:57 +0000 |
|---|---|---|
| committer | Christian Limpach <Christian.Limpach@xensource.com> | 2007-01-19 14:48:57 +0000 |
| commit | c6a0a466fab92f08e73fe2bdaed40ef73f524c9b (patch) | |
| tree | 4946ac5fcbb06016b2c3ab8a73cb22d73e7c00e6 /buildconfigs/linux-defconfig_xen0_x86_32 | |
| parent | 361f8004cbabe9cdb5386cf2c838b5c732feb53a (diff) | |
| parent | beb6098f214a6c227f0dce614f48cd0fc391da2d (diff) | |
| download | xen-c6a0a466fab92f08e73fe2bdaed40ef73f524c9b.tar.gz xen-c6a0a466fab92f08e73fe2bdaed40ef73f524c9b.tar.bz2 xen-c6a0a466fab92f08e73fe2bdaed40ef73f524c9b.zip | |
[merge] with xen-unstable
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
Diffstat (limited to 'buildconfigs/linux-defconfig_xen0_x86_32')
| -rw-r--r-- | buildconfigs/linux-defconfig_xen0_x86_32 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/buildconfigs/linux-defconfig_xen0_x86_32 b/buildconfigs/linux-defconfig_xen0_x86_32 index 76b2840685..27fc2f666a 100644 --- a/buildconfigs/linux-defconfig_xen0_x86_32 +++ b/buildconfigs/linux-defconfig_xen0_x86_32 @@ -569,7 +569,7 @@ CONFIG_MEGARAID_NEWGEN=y # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_SATA=y -# CONFIG_SCSI_SATA_AHCI is not set +CONFIG_SCSI_SATA_AHCI=y # CONFIG_SCSI_SATA_SVW is not set CONFIG_SCSI_ATA_PIIX=y # CONFIG_SCSI_SATA_MV is not set @@ -734,7 +734,7 @@ CONFIG_E1000=y CONFIG_SK98LIN=y # CONFIG_VIA_VELOCITY is not set CONFIG_TIGON3=y -# CONFIG_BNX2 is not set +CONFIG_BNX2=y # # Ethernet (10000 Mbit) @@ -1413,8 +1413,6 @@ CONFIG_XEN_SYSFS=y CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y -CONFIG_HAVE_ARCH_ALLOC_SKB=y -CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y CONFIG_XEN_UTIL=y |