r4166 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm hppa i386 ia64 m68k powerpc s390 sparc

Frederik Schüler fschueler-guest at costa.debian.org
Sat Sep 10 18:21:43 UTC 2005 

Author: fschueler-guest
Date: 2005-09-10 18:21:40 +0000 (Sat, 10 Sep 2005)
New Revision: 4166

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
   dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
   dists/trunk/linux-2.6/debian/arch/amd64/defines
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
Log:
First shot of 2.6.13 options for amd64, touching other arches too. 
We might need to discuss the one or other global option, especially if we 
want to enable TPM or not.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -299,7 +299,6 @@
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
@@ -375,7 +374,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -1580,7 +1578,6 @@
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
 CONFIG_USB_ZD1201=m
-CONFIG_USB_MON=m
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc	2005-09-10 18:21:40 UTC (rev 4166)
@@ -3,4 +3,5 @@
 #
 initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
 headers_dirs = x86_64
+build_makeflags :=  'V=1'
 

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -340,7 +340,6 @@
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
@@ -392,7 +391,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -1251,7 +1249,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -1511,7 +1508,6 @@
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
 CONFIG_USB_ZD1201=m
-CONFIG_USB_MON=m
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
@@ -1742,3 +1738,13 @@
 CONFIG_CRC32=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_KEXEC is not set
+CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_FUSION=y
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_PHYSICAL_START=0x100000
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_HZ_100 is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	2005-09-10 18:21:40 UTC (rev 4166)
@@ -47,3 +47,12 @@
 CONFIG_EXT2_FS=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_CHECKING is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_HZ_1000=y
+# CONFIG_HZ_250 is not set
+CONFIG_HZ=1000

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	2005-09-10 18:21:40 UTC (rev 4166)
@@ -47,3 +47,12 @@
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
 # CONFIG_CHECKING is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_HZ_1000=y
+# CONFIG_HZ_250 is not set
+CONFIG_HZ=1000

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-09-10 18:21:40 UTC (rev 4166)
@@ -22,3 +22,17 @@
 # CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
+CONFIG_HZ_250=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HAVE_MEMORY_PRESENT=y
+# CONFIG_HZ_1000 is not set
+CONFIG_PREEMPT_BKL=y
+CONFIG_HZ=250
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+# CONFIG_FLATMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	2005-09-10 18:21:40 UTC (rev 4166)
@@ -47,3 +47,12 @@
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
 # CONFIG_CHECKING is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_HZ_250 is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_FLATMEM_MANUAL=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	2005-09-10 18:21:40 UTC (rev 4166)
@@ -20,3 +20,14 @@
 CONFIG_SOUND_AWE32_SYNTH=m
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_HZ_250=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_PREEMPT_BKL=y
+CONFIG_HZ=250
+CONFIG_FLATMEM_MANUAL=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/defines	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines	2005-09-10 18:21:40 UTC (rev 4166)
@@ -7,6 +7,7 @@
  em64t-p4
  em64t-p4-smp
 suggests: lilo (>= 19.1) | grub, fdutils
+kernel-arch: x86_64
 
 [amd64-generic]
 class: all x86-64 

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	2005-09-10 18:21:40 UTC (rev 4166)
@@ -301,7 +301,6 @@
 CONFIG_NVRAM=m
 CONFIG_RTC=y
 # CONFIG_APPLICOM is not set
-# CONFIG_TCG_TPM is not set
 CONFIG_I2C=m
 # CONFIG_I2C_CHARDEV is not set
 # CONFIG_I2C_ALGOBIT is not set
@@ -447,7 +446,6 @@
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET is not set
-CONFIG_USB_MON=m
 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_AUERSWALD is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	2005-09-10 18:21:40 UTC (rev 4166)
@@ -417,7 +417,6 @@
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_TCG_TPM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_ALGOBIT=y

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-09-10 18:21:40 UTC (rev 4166)
@@ -73,7 +73,6 @@
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SATA is not set
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	2005-09-10 18:21:40 UTC (rev 4166)
@@ -115,7 +115,6 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_SECCOMP=y
-CONFIG_TCG_TPM=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
@@ -236,7 +235,6 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_SECCOMP=y
-CONFIG_TCG_TPM=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
@@ -461,7 +459,6 @@
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 CONFIG_S3C2410_RTC=y
-# CONFIG_TCG_TPM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_ALGOBIT=m

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -168,7 +168,6 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_SECCOMP=y
-CONFIG_TCG_TPM=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
@@ -238,7 +237,6 @@
 CONFIG_TCG_INFINEON=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_USB_MON=y
 CONFIG_HWMON=y
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_CRYPTO_MD5=y
@@ -291,3 +289,15 @@
 CONFIG_NTFS_RW=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_ACPI_HOTKEY=m
+CONFIG_NFS_COMMON=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_FUSION=m
+CONFIG_SCSI_SATA=y
+# CONFIG_FB_VESA is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_SCSI_QLA2XXX=m
+CONFIG_USB_MON=y

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -196,7 +196,6 @@
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 CONFIG_MEGARAID_LEGACY=m
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_DTC3280 is not set
@@ -258,7 +257,6 @@
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
-# CONFIG_FUSION is not set
 # CONFIG_IEEE1394 is not set
 CONFIG_I2O=m
 CONFIG_I2O_CONFIG=m
@@ -702,7 +700,6 @@
 # CONFIG_DRM is not set
 CONFIG_SYNCLINK_CS=m
 # CONFIG_RAW_DRIVER is not set
-CONFIG_TCG_TPM=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 # CONFIG_I2C is not set
@@ -893,7 +890,6 @@
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_ZD1201 is not set
-CONFIG_USB_MON=m
 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_AUERSWALD is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -404,7 +404,6 @@
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
@@ -488,7 +487,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -1454,7 +1452,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -1763,7 +1760,6 @@
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
 CONFIG_USB_ZD1201=m
-CONFIG_USB_MON=m
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -285,7 +285,6 @@
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 # CONFIG_SCSI_SATA_SVW is not set
 CONFIG_SCSI_ATA_PIIX=m
@@ -330,7 +329,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -1242,7 +1240,6 @@
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
 CONFIG_USB_ZD1201=m
-CONFIG_USB_MON=m
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -79,7 +79,6 @@
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -223,7 +223,6 @@
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 # CONFIG_MEGARAID_LEGACY is not set
-CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 # CONFIG_SCSI_ATA_PIIX is not set
@@ -277,7 +276,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 # CONFIG_FUSION_LAN is not set
@@ -1208,7 +1206,6 @@
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
 CONFIG_USB_ZD1201=m
-# CONFIG_USB_MON is not set
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRPRIME=m

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -52,7 +52,6 @@
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_ZFCP=m
 CONFIG_CCW=y
@@ -210,7 +209,6 @@
 # CONFIG_NETCONSOLE is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_JBD=y

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-10 18:21:40 UTC (rev 4166)
@@ -91,7 +91,6 @@
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INIA100 is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	2005-09-10 18:21:40 UTC (rev 4166)
@@ -144,7 +144,6 @@
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_SUNESP=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -405,7 +404,6 @@
 CONFIG_USB_ZAURUS=y
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
-CONFIG_USB_MON=m
 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_AUERSWALD is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-09-10 17:36:08 UTC (rev 4165)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-09-10 18:21:40 UTC (rev 4166)
@@ -147,7 +147,6 @@
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_SUNESP=m
-CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -408,7 +407,6 @@
 CONFIG_USB_ZAURUS=y
 CONFIG_USB_CDCETHER=y
 CONFIG_USB_AX8817X=y
-CONFIG_USB_MON=m
 # CONFIG_USB_USS720 is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_AUERSWALD is not set

More information about the Kernel-svn-changes mailing list