diff options
| author | vhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com> | 2006-04-20 17:09:53 +0100 |
|---|---|---|
| committer | vhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com> | 2006-04-20 17:09:53 +0100 |
| commit | 253f67ff6f9fc7dd8bb672d2100a21b4faac1ca0 (patch) | |
| tree | edeeb2b9590a6565f40d3e679c72b66f240218a1 /buildconfigs | |
| parent | 4cab737e18d8d747de91611f40b511ee0882cac1 (diff) | |
| download | xen-253f67ff6f9fc7dd8bb672d2100a21b4faac1ca0.tar.gz xen-253f67ff6f9fc7dd8bb672d2100a21b4faac1ca0.tar.bz2 xen-253f67ff6f9fc7dd8bb672d2100a21b4faac1ca0.zip | |
adjustement to default configs to build BLK_DEV_GENERIC in the kernel directly.
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/linux-defconfig_xen_x86_32 | 11 | ||||
| -rw-r--r-- | buildconfigs/linux-defconfig_xen_x86_64 | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/buildconfigs/linux-defconfig_xen_x86_32 b/buildconfigs/linux-defconfig_xen_x86_32 index 9fd2009a90..d1cc0b6706 100644 --- a/buildconfigs/linux-defconfig_xen_x86_32 +++ b/buildconfigs/linux-defconfig_xen_x86_32 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-xen -# Wed Apr 19 15:23:18 2006 +# Thu Apr 20 17:07:18 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -978,8 +978,8 @@ CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=m -CONFIG_BLK_DEV_IDE=m +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives @@ -1005,7 +1005,7 @@ CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_BLK_DEV_OFFBOARD=y -CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -1109,7 +1109,7 @@ CONFIG_MEGARAID_SAS=m CONFIG_SCSI_SATA=m CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m -CONFIG_SCSI_ATA_PIIX=y +CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_MV=m CONFIG_SCSI_SATA_NV=m CONFIG_SCSI_PDC_ADMA=m @@ -1122,6 +1122,7 @@ CONFIG_SCSI_SATA_SIS=m CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m +CONFIG_SCSI_SATA_INTEL_COMBINED=y CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set CONFIG_SCSI_DMX3191D=m diff --git a/buildconfigs/linux-defconfig_xen_x86_64 b/buildconfigs/linux-defconfig_xen_x86_64 index 59cc48cfd8..64b6d70781 100644 --- a/buildconfigs/linux-defconfig_xen_x86_64 +++ b/buildconfigs/linux-defconfig_xen_x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-xen -# Wed Apr 19 19:18:27 2006 +# Thu Apr 20 17:05:48 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -928,8 +928,8 @@ CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=m -CONFIG_BLK_DEV_IDE=m +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives @@ -955,7 +955,7 @@ CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_BLK_DEV_OFFBOARD=y -CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_GENERIC=y # CONFIG_BLK_DEV_OPTI621 is not set CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -1057,7 +1057,7 @@ CONFIG_MEGARAID_SAS=m CONFIG_SCSI_SATA=m CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m -CONFIG_SCSI_ATA_PIIX=y +CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_MV=m CONFIG_SCSI_SATA_NV=m CONFIG_SCSI_PDC_ADMA=m @@ -1070,6 +1070,7 @@ CONFIG_SCSI_SATA_SIS=m CONFIG_SCSI_SATA_ULI=m CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VITESSE=m +CONFIG_SCSI_SATA_INTEL_COMBINED=y CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set CONFIG_SCSI_DMX3191D=m |