bitkeeper revision 1.1159.170.65 (41cec23dGYBVm5BqHogt6mEw18Mo5g)

Kconfig:
  Fix processor selection entry.
xenU_defconfig, xen0_defconfig:
  Update default configs.

diff --git a/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig
index d3ff092e5e56d4eb741ea638471c180b801036c6..6f7872ea71ca1b5e511d2ec90b94add2740e62b4 100644 (file)
--- a/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-rc2-xen0
-# Thu Dec 23 14:01:43 2004
+# Linux kernel version: 2.6.10-rc3-xen0
+# Sun Dec 26 10:34:29 2004
 #
 CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
@@ -93,6 +93,7 @@ CONFIG_MPENTIUM4=y
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
@@ -222,6 +223,7 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -393,7 +395,6 @@ CONFIG_SCSI_BUSLOGIC=y
 # CONFIG_SCSI_QLOGIC_ISP is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_1280_1040 is not set
 CONFIG_SCSI_QLA2XXX=y
 # CONFIG_SCSI_QLA21XX is not set
 # CONFIG_SCSI_QLA22XX is not set
@@ -853,6 +854,10 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+
 #
 # USB Gadget Support
 #

diff --git a/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig b/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig
index 0e7dc0a3b3056fdbccd144dd7300c12445960501..e90dd4bc5a21160e7d97f4d78efb74070fdf8728 100644 (file)
--- a/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig
+++ b/linux-2.6.10-rc3-xen-sparse/arch/xen/configs/xenU_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-rc2-xenU
-# Thu Dec 23 14:02:24 2004
+# Linux kernel version: 2.6.10-rc3-xenU
+# Sun Dec 26 10:35:15 2004
 #
 CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
@@ -92,6 +92,7 @@ CONFIG_MPENTIUM4=y
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
@@ -171,6 +172,7 @@ CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -217,7 +219,6 @@ CONFIG_BLK_DEV_SD=m
 # SCSI low-level drivers
 #
 # CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_QLOGIC_1280_1040 is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #

diff --git a/linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig b/linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig
index f34d271ff6776338540dc5d251d95167e69f401e..513420e2864724a89197c8b94a42b542d1ef90fc 100644 (file)
--- a/linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig
+++ b/linux-2.6.10-rc3-xen-sparse/arch/xen/i386/Kconfig
@@ -61,7 +61,7 @@ config M386
          - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
          - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
          - "Crusoe" for the Transmeta Crusoe series.
-#        - "Efficeon" for the Transmeta Efficeon series.
+         - "Efficeon" for the Transmeta Efficeon series.
          - "Winchip-C6" for original IDT Winchip.
          - "Winchip-2" for IDT Winchip 2.
          - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.