ia64/xen-unstable

changeset 3329:73da7a950ed4

bitkeeper revision 1.1159.170.65 (41cec23dGYBVm5BqHogt6mEw18Mo5g)

Kconfig:
Fix processor selection entry.
xenU_defconfig, xen0_defconfig:
Update default configs.
author cl349@arcadians.cl.cam.ac.uk
date Sun Dec 26 13:53:01 2004 +0000 (2004-12-26)
parents 708bd9c8362b
children 56a5e9ed0e89
files linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig
line diff
     1.1 --- a/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Dec 26 10:00:51 2004 +0000
     1.2 +++ b/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Dec 26 13:53:01 2004 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Linux kernel version: 2.6.10-rc2-xen0
     1.7 -# Thu Dec 23 14:01:43 2004
     1.8 +# Linux kernel version: 2.6.10-rc3-xen0
     1.9 +# Sun Dec 26 10:34:29 2004
    1.10  #
    1.11  CONFIG_XEN=y
    1.12  CONFIG_ARCH_XEN=y
    1.13 @@ -93,6 +93,7 @@ CONFIG_MPENTIUM4=y
    1.14  # CONFIG_MK7 is not set
    1.15  # CONFIG_MK8 is not set
    1.16  # CONFIG_MCRUSOE is not set
    1.17 +# CONFIG_MEFFICEON is not set
    1.18  # CONFIG_MWINCHIPC6 is not set
    1.19  # CONFIG_MWINCHIP2 is not set
    1.20  # CONFIG_MWINCHIP3D is not set
    1.21 @@ -222,6 +223,7 @@ CONFIG_BLK_DEV_LOOP=y
    1.22  # CONFIG_BLK_DEV_NBD is not set
    1.23  # CONFIG_BLK_DEV_SX8 is not set
    1.24  CONFIG_BLK_DEV_RAM=y
    1.25 +CONFIG_BLK_DEV_RAM_COUNT=16
    1.26  CONFIG_BLK_DEV_RAM_SIZE=4096
    1.27  CONFIG_BLK_DEV_INITRD=y
    1.28  CONFIG_INITRAMFS_SOURCE=""
    1.29 @@ -393,7 +395,6 @@ CONFIG_SCSI_BUSLOGIC=y
    1.30  # CONFIG_SCSI_QLOGIC_ISP is not set
    1.31  # CONFIG_SCSI_QLOGIC_FC is not set
    1.32  # CONFIG_SCSI_QLOGIC_1280 is not set
    1.33 -# CONFIG_SCSI_QLOGIC_1280_1040 is not set
    1.34  CONFIG_SCSI_QLA2XXX=y
    1.35  # CONFIG_SCSI_QLA21XX is not set
    1.36  # CONFIG_SCSI_QLA22XX is not set
    1.37 @@ -854,6 +855,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
    1.38  CONFIG_USB_ARCH_HAS_OHCI=y
    1.39  
    1.40  #
    1.41 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
    1.42 +#
    1.43 +
    1.44 +#
    1.45  # USB Gadget Support
    1.46  #
    1.47  # CONFIG_USB_GADGET is not set
     2.1 --- a/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Dec 26 10:00:51 2004 +0000
     2.2 +++ b/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig	Sun Dec 26 13:53:01 2004 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 -# Linux kernel version: 2.6.10-rc2-xenU
     2.7 -# Thu Dec 23 14:02:24 2004
     2.8 +# Linux kernel version: 2.6.10-rc3-xenU
     2.9 +# Sun Dec 26 10:35:15 2004
    2.10  #
    2.11  CONFIG_XEN=y
    2.12  CONFIG_ARCH_XEN=y
    2.13 @@ -92,6 +92,7 @@ CONFIG_MPENTIUM4=y
    2.14  # CONFIG_MK7 is not set
    2.15  # CONFIG_MK8 is not set
    2.16  # CONFIG_MCRUSOE is not set
    2.17 +# CONFIG_MEFFICEON is not set
    2.18  # CONFIG_MWINCHIPC6 is not set
    2.19  # CONFIG_MWINCHIP2 is not set
    2.20  # CONFIG_MWINCHIP3D is not set
    2.21 @@ -171,6 +172,7 @@ CONFIG_BLK_DEV_LOOP=m
    2.22  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
    2.23  CONFIG_BLK_DEV_NBD=m
    2.24  CONFIG_BLK_DEV_RAM=y
    2.25 +CONFIG_BLK_DEV_RAM_COUNT=16
    2.26  CONFIG_BLK_DEV_RAM_SIZE=4096
    2.27  CONFIG_BLK_DEV_INITRD=y
    2.28  CONFIG_INITRAMFS_SOURCE=""
    2.29 @@ -217,7 +219,6 @@ CONFIG_BLK_DEV_SD=m
    2.30  # SCSI low-level drivers
    2.31  #
    2.32  # CONFIG_SCSI_SATA is not set
    2.33 -# CONFIG_SCSI_QLOGIC_1280_1040 is not set
    2.34  # CONFIG_SCSI_DEBUG is not set
    2.35  
    2.36  #
     3.1 --- a/linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig	Sun Dec 26 10:00:51 2004 +0000
     3.2 +++ b/linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig	Sun Dec 26 13:53:01 2004 +0000
     3.3 @@ -61,7 +61,7 @@ config M386
     3.4  	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
     3.5  	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
     3.6  	  - "Crusoe" for the Transmeta Crusoe series.
     3.7 -#	  - "Efficeon" for the Transmeta Efficeon series.
     3.8 +	  - "Efficeon" for the Transmeta Efficeon series.
     3.9  	  - "Winchip-C6" for original IDT Winchip.
    3.10  	  - "Winchip-2" for IDT Winchip 2.
    3.11  	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.