ia64/xen-unstable

changeset 9794:482c3d3cbc92

adjustement to default configs to build BLK_DEV_GENERIC in the kernel directly.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vhanquez@kneesa.uk.xensource.com
date Thu Apr 20 17:09:53 2006 +0100 (2006-04-20)
parents d580da01ded7
children dbf7032f1fc6
files buildconfigs/linux-defconfig_xen_x86_32 buildconfigs/linux-defconfig_xen_x86_64
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen_x86_32	Thu Apr 20 17:02:42 2006 +0100
     1.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32	Thu Apr 20 17:09:53 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6  # Linux kernel version: 2.6.16-xen
     1.7 -# Wed Apr 19 15:23:18 2006
     1.8 +# Thu Apr 20 17:07:18 2006
     1.9  #
    1.10  CONFIG_X86_32=y
    1.11  CONFIG_SEMAPHORE_SLEEPERS=y
    1.12 @@ -978,8 +978,8 @@ CONFIG_ATA_OVER_ETH=m
    1.13  #
    1.14  # ATA/ATAPI/MFM/RLL support
    1.15  #
    1.16 -CONFIG_IDE=m
    1.17 -CONFIG_BLK_DEV_IDE=m
    1.18 +CONFIG_IDE=y
    1.19 +CONFIG_BLK_DEV_IDE=y
    1.20  
    1.21  #
    1.22  # Please see Documentation/ide.txt for help/info on IDE drives
    1.23 @@ -1005,7 +1005,7 @@ CONFIG_BLK_DEV_IDEPNP=y
    1.24  CONFIG_BLK_DEV_IDEPCI=y
    1.25  CONFIG_IDEPCI_SHARE_IRQ=y
    1.26  CONFIG_BLK_DEV_OFFBOARD=y
    1.27 -CONFIG_BLK_DEV_GENERIC=m
    1.28 +CONFIG_BLK_DEV_GENERIC=y
    1.29  CONFIG_BLK_DEV_OPTI621=m
    1.30  CONFIG_BLK_DEV_RZ1000=m
    1.31  CONFIG_BLK_DEV_IDEDMA_PCI=y
    1.32 @@ -1109,7 +1109,7 @@ CONFIG_MEGARAID_SAS=m
    1.33  CONFIG_SCSI_SATA=m
    1.34  CONFIG_SCSI_SATA_AHCI=m
    1.35  CONFIG_SCSI_SATA_SVW=m
    1.36 -CONFIG_SCSI_ATA_PIIX=y
    1.37 +CONFIG_SCSI_ATA_PIIX=m
    1.38  CONFIG_SCSI_SATA_MV=m
    1.39  CONFIG_SCSI_SATA_NV=m
    1.40  CONFIG_SCSI_PDC_ADMA=m
    1.41 @@ -1122,6 +1122,7 @@ CONFIG_SCSI_SATA_SIS=m
    1.42  CONFIG_SCSI_SATA_ULI=m
    1.43  CONFIG_SCSI_SATA_VIA=m
    1.44  CONFIG_SCSI_SATA_VITESSE=m
    1.45 +CONFIG_SCSI_SATA_INTEL_COMBINED=y
    1.46  CONFIG_SCSI_BUSLOGIC=m
    1.47  # CONFIG_SCSI_OMIT_FLASHPOINT is not set
    1.48  CONFIG_SCSI_DMX3191D=m
     2.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Thu Apr 20 17:02:42 2006 +0100
     2.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Thu Apr 20 17:09:53 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6  # Linux kernel version: 2.6.16-xen
     2.7 -# Wed Apr 19 19:18:27 2006
     2.8 +# Thu Apr 20 17:05:48 2006
     2.9  #
    2.10  CONFIG_X86_64=y
    2.11  CONFIG_64BIT=y
    2.12 @@ -928,8 +928,8 @@ CONFIG_ATA_OVER_ETH=m
    2.13  #
    2.14  # ATA/ATAPI/MFM/RLL support
    2.15  #
    2.16 -CONFIG_IDE=m
    2.17 -CONFIG_BLK_DEV_IDE=m
    2.18 +CONFIG_IDE=y
    2.19 +CONFIG_BLK_DEV_IDE=y
    2.20  
    2.21  #
    2.22  # Please see Documentation/ide.txt for help/info on IDE drives
    2.23 @@ -955,7 +955,7 @@ CONFIG_BLK_DEV_IDEPNP=y
    2.24  CONFIG_BLK_DEV_IDEPCI=y
    2.25  CONFIG_IDEPCI_SHARE_IRQ=y
    2.26  CONFIG_BLK_DEV_OFFBOARD=y
    2.27 -CONFIG_BLK_DEV_GENERIC=m
    2.28 +CONFIG_BLK_DEV_GENERIC=y
    2.29  # CONFIG_BLK_DEV_OPTI621 is not set
    2.30  CONFIG_BLK_DEV_RZ1000=m
    2.31  CONFIG_BLK_DEV_IDEDMA_PCI=y
    2.32 @@ -1057,7 +1057,7 @@ CONFIG_MEGARAID_SAS=m
    2.33  CONFIG_SCSI_SATA=m
    2.34  CONFIG_SCSI_SATA_AHCI=m
    2.35  CONFIG_SCSI_SATA_SVW=m
    2.36 -CONFIG_SCSI_ATA_PIIX=y
    2.37 +CONFIG_SCSI_ATA_PIIX=m
    2.38  CONFIG_SCSI_SATA_MV=m
    2.39  CONFIG_SCSI_SATA_NV=m
    2.40  CONFIG_SCSI_PDC_ADMA=m
    2.41 @@ -1070,6 +1070,7 @@ CONFIG_SCSI_SATA_SIS=m
    2.42  CONFIG_SCSI_SATA_ULI=m
    2.43  CONFIG_SCSI_SATA_VIA=m
    2.44  CONFIG_SCSI_SATA_VITESSE=m
    2.45 +CONFIG_SCSI_SATA_INTEL_COMBINED=y
    2.46  CONFIG_SCSI_BUSLOGIC=m
    2.47  # CONFIG_SCSI_OMIT_FLASHPOINT is not set
    2.48  CONFIG_SCSI_DMX3191D=m