From 1e22609a36754b7b2688217441c8cbb6b7f44343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Sat, 10 Sep 2005 18:21:40 +0000 Subject: [PATCH] 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. svn path=/dists/trunk/linux-2.6/; revision=4166 --- debian/arch/alpha/config | 3 --- debian/arch/amd64/Makefile.inc | 1 + debian/arch/amd64/config | 14 ++++++++++---- debian/arch/amd64/config.amd64-generic | 9 +++++++++ debian/arch/amd64/config.amd64-k8 | 9 +++++++++ debian/arch/amd64/config.amd64-k8-smp | 14 ++++++++++++++ debian/arch/amd64/config.em64t-p4 | 9 +++++++++ debian/arch/amd64/config.em64t-p4-smp | 11 +++++++++++ debian/arch/amd64/defines | 1 + debian/arch/arm/config.footbridge | 2 -- debian/arch/arm/config.ixp4xx | 1 - debian/arch/arm/config.rpc | 1 - debian/arch/arm/config.s3c2410 | 3 --- debian/arch/config | 14 ++++++++++++-- debian/arch/hppa/config | 4 ---- debian/arch/i386/config | 4 ---- debian/arch/ia64/config | 3 --- debian/arch/m68k/config | 1 - debian/arch/powerpc/config | 3 --- debian/arch/s390/config | 2 -- debian/arch/sparc/config | 1 - debian/arch/sparc/config.sparc64 | 2 -- debian/arch/sparc/config.sparc64-smp | 2 -- 23 files changed, 76 insertions(+), 38 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 5ddfc1874..66e86fad6 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -299,7 +299,6 @@ CONFIG_MEGARAID_NEWGEN=y 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_RAID10=m 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_ZAURUS=y 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 diff --git a/debian/arch/amd64/Makefile.inc b/debian/arch/amd64/Makefile.inc index a022b9028..791ce6bbe 100644 --- a/debian/arch/amd64/Makefile.inc +++ b/debian/arch/amd64/Makefile.inc @@ -3,4 +3,5 @@ # initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko headers_dirs = x86_64 +build_makeflags := 'V=1' diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 2989f24ba..1b6b7dd52 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -340,7 +340,6 @@ CONFIG_MEGARAID_NEWGEN=y 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_RAID10=m 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_CYBER2000=m # 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_ZAURUS=y 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_CRC_CCITT=m 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 diff --git a/debian/arch/amd64/config.amd64-generic b/debian/arch/amd64/config.amd64-generic index 750078200..7139bcd6f 100644 --- a/debian/arch/amd64/config.amd64-generic +++ b/debian/arch/amd64/config.amd64-generic @@ -47,3 +47,12 @@ CONFIG_USB_SERIAL_WHITEHEAT=m 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 diff --git a/debian/arch/amd64/config.amd64-k8 b/debian/arch/amd64/config.amd64-k8 index b88419d65..5c147f886 100644 --- a/debian/arch/amd64/config.amd64-k8 +++ b/debian/arch/amd64/config.amd64-k8 @@ -47,3 +47,12 @@ CONFIG_USB_SERIAL_WHITEHEAT=m 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 diff --git a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp index bec700668..61daa55b6 100644 --- a/debian/arch/amd64/config.amd64-k8-smp +++ b/debian/arch/amd64/config.amd64-k8-smp @@ -22,3 +22,17 @@ CONFIG_FB_MATROX_MAVEN=m # 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 diff --git a/debian/arch/amd64/config.em64t-p4 b/debian/arch/amd64/config.em64t-p4 index f41c8c489..59353e12c 100644 --- a/debian/arch/amd64/config.em64t-p4 +++ b/debian/arch/amd64/config.em64t-p4 @@ -47,3 +47,12 @@ CONFIG_USB_SERIAL_WHITEHEAT=m 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 diff --git a/debian/arch/amd64/config.em64t-p4-smp b/debian/arch/amd64/config.em64t-p4-smp index 4c3de3cc8..2c933627d 100644 --- a/debian/arch/amd64/config.em64t-p4-smp +++ b/debian/arch/amd64/config.em64t-p4-smp @@ -20,3 +20,14 @@ CONFIG_R8169_VLAN=y 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 diff --git a/debian/arch/amd64/defines b/debian/arch/amd64/defines index 4d44f8fdc..bc6e3d5aa 100644 --- a/debian/arch/amd64/defines +++ b/debian/arch/amd64/defines @@ -7,6 +7,7 @@ flavours: em64t-p4 em64t-p4-smp suggests: lilo (>= 19.1) | grub, fdutils +kernel-arch: x86_64 [amd64-generic] class: all x86-64 diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 72745760f..d892f0a83 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -301,7 +301,6 @@ CONFIG_NWFLASH=m 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_PRINTER=m # 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 diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 04fcb2278..9cffca5f8 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -417,7 +417,6 @@ CONFIG_IXP4XX_WATCHDOG=y # 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 diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 8d84e7d47..73aa8d36c 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -73,7 +73,6 @@ CONFIG_SCSI_LOGGING=y # 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 diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index f83d17d46..19bf25eab 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -115,7 +115,6 @@ CONFIG_LIBCRC32C=m 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_LIBCRC32C=m 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_S3C2410_WATCHDOG=y # 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 diff --git a/debian/arch/config b/debian/arch/config index cd483f553..e6af07c69 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -168,7 +168,6 @@ CONFIG_LIBCRC32C=m 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_PCMCIA_IOCTL=y 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_FS=m 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 diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 900696df6..2c63cb952 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -196,7 +196,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m # 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_MIRROR=m 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_GEN_RTC=y # 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_MOUSE=m # 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index b484ea779..d93f1af21 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -404,7 +404,6 @@ CONFIG_MEGARAID_NEWGEN=y 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_RAID10=m 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_CYBER2000=m # 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_ZAURUS=y 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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 969fa7853..d0332ecb3 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -285,7 +285,6 @@ CONFIG_MEGARAID_NEWGEN=y 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_RAID10=m 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_ZAURUS=y 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 diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index de8019ee1..ecc170315 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -79,7 +79,6 @@ CONFIG_SCSI_CONSTANTS=y # 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 diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 154b88142..61ce6820d 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -223,7 +223,6 @@ CONFIG_MEGARAID_NEWGEN=y 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_RAID10=m 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_ZAURUS=y 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 diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 81664063e..0d467c693 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -52,7 +52,6 @@ CONFIG_SCSI_MULTI_LUN=y 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_CCWGROUP=m # 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 diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index 6b8511178..e5a22c50d 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -91,7 +91,6 @@ CONFIG_SCSI_SPI_ATTRS=m # 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 diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index cce7fb46f..e6ce0e672 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -144,7 +144,6 @@ CONFIG_SCSI_QLOGICPTI=m 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_EPSON2888=y 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 diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index 9fe74a9cb..199f7dffa 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -147,7 +147,6 @@ CONFIG_SCSI_QLOGICPTI=m 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_EPSON2888=y 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