ia64/xen-unstable

changeset 1957:2cf5a0ee2c00

bitkeeper revision 1.1108.1.37 (4107d02dYcJF8TH5jTer5ND5P5M1bw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
author cl349@freefall.cl.cam.ac.uk
date Wed Jul 28 16:11:25 2004 +0000 (2004-07-28)
parents 6daa82a1130a 99b89b7e112d
children 57bae9faf165 6670d27fd5df 4823a2b67eea
files linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Jul 28 15:41:31 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Jul 28 16:11:25 2004 +0000
     1.3 @@ -163,8 +163,60 @@ CONFIG_BINFMT_ELF=y
     1.4  # ATA/ATAPI/MFM/RLL support
     1.5  #
     1.6  CONFIG_IDE=y
     1.7 -# CONFIG_BLK_DEV_IDE is not set
     1.8 -# CONFIG_BLK_DEV_HD_ONLY is not set
     1.9 +CONFIG_BLK_DEV_IDE=y
    1.10 +
    1.11 +#
    1.12 +# Please see Documentation/ide.txt for help/info on IDE drives
    1.13 +#
    1.14 +# CONFIG_BLK_DEV_HD_IDE is not set
    1.15 +CONFIG_BLK_DEV_IDEDISK=y
    1.16 +# CONFIG_IDEDISK_MULTI_MODE is not set
    1.17 +CONFIG_BLK_DEV_IDECD=y
    1.18 +# CONFIG_BLK_DEV_IDEFLOPPY is not set
    1.19 +# CONFIG_BLK_DEV_IDESCSI is not set
    1.20 +# CONFIG_IDE_TASK_IOCTL is not set
    1.21 +
    1.22 +#
    1.23 +# IDE chipset support/bugfixes
    1.24 +#
    1.25 +CONFIG_IDE_GENERIC=y
    1.26 +# CONFIG_BLK_DEV_CMD640 is not set
    1.27 +CONFIG_BLK_DEV_IDEPCI=y
    1.28 +# CONFIG_IDEPCI_SHARE_IRQ is not set
    1.29 +# CONFIG_BLK_DEV_OFFBOARD is not set
    1.30 +CONFIG_BLK_DEV_GENERIC=y
    1.31 +# CONFIG_BLK_DEV_RZ1000 is not set
    1.32 +CONFIG_BLK_DEV_IDEDMA_PCI=y
    1.33 +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
    1.34 +CONFIG_IDEDMA_PCI_AUTO=y
    1.35 +# CONFIG_IDEDMA_ONLYDISK is not set
    1.36 +CONFIG_BLK_DEV_ADMA=y
    1.37 +# CONFIG_BLK_DEV_AEC62XX is not set
    1.38 +# CONFIG_BLK_DEV_ALI15X3 is not set
    1.39 +# CONFIG_BLK_DEV_AMD74XX is not set
    1.40 +# CONFIG_BLK_DEV_ATIIXP is not set
    1.41 +# CONFIG_BLK_DEV_CMD64X is not set
    1.42 +# CONFIG_BLK_DEV_TRIFLEX is not set
    1.43 +# CONFIG_BLK_DEV_CY82C693 is not set
    1.44 +# CONFIG_BLK_DEV_CS5530 is not set
    1.45 +# CONFIG_BLK_DEV_HPT34X is not set
    1.46 +# CONFIG_BLK_DEV_HPT366 is not set
    1.47 +# CONFIG_BLK_DEV_SC1200 is not set
    1.48 +CONFIG_BLK_DEV_PIIX=y
    1.49 +# CONFIG_BLK_DEV_NS87415 is not set
    1.50 +# CONFIG_BLK_DEV_PDC202XX_OLD is not set
    1.51 +# CONFIG_BLK_DEV_PDC202XX_NEW is not set
    1.52 +# CONFIG_BLK_DEV_SVWKS is not set
    1.53 +# CONFIG_BLK_DEV_SIIMAGE is not set
    1.54 +# CONFIG_BLK_DEV_SIS5513 is not set
    1.55 +# CONFIG_BLK_DEV_SLC90E66 is not set
    1.56 +# CONFIG_BLK_DEV_TRM290 is not set
    1.57 +# CONFIG_BLK_DEV_VIA82CXXX is not set
    1.58 +# CONFIG_IDE_ARM is not set
    1.59 +# CONFIG_IDE_CHIPSETS is not set
    1.60 +CONFIG_BLK_DEV_IDEDMA=y
    1.61 +# CONFIG_IDEDMA_IVB is not set
    1.62 +CONFIG_IDEDMA_AUTO=y
    1.63  # CONFIG_BLK_DEV_HD is not set
    1.64  
    1.65  #