rpms/kernel/FC-4/configs config-generic, 1.44, 1.45 config-x86-generic, 1.16, 1.17 config-x86_64, 1.1, 1.2 config-x86_64-generic, 1.14, 1.15

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jan 6 05:42:22 UTC 2006 

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7762/configs

Modified Files:
	config-generic config-x86-generic config-x86_64 
	config-x86_64-generic 
Log Message:
2.6.15 rebase. Let the fun begin. (again).



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- config-generic	14 Dec 2005 02:22:28 -0000	1.44
+++ config-generic	6 Jan 2006 05:42:19 -0000	1.45
@@ -3,7 +3,7 @@
 #
 CONFIG_MMU=y
 CONFIG_SMP=y
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
 
 #
@@ -13,7 +13,6 @@
 CONFIG_CLEAN_COMPILE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-
 #
 # General setup
 #
@@ -35,6 +34,7 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_CFQ=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_PREEMPT_NONE=y 
 # CONFIG_PREEMPT_VOLUNTARY is not set
@@ -61,7 +61,6 @@
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
-# CONFIG_PCI_NAMES is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -99,7 +98,7 @@
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_USER_VERBS=m
+CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 
@@ -124,10 +123,9 @@
 #
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CONCAT=m
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_PARTITIONS=y
 #
 # User Modules And Translation Layers
 #
@@ -139,7 +137,7 @@
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_INFTL=m
-
+CONFIG_RFD_FTL=m
 
 #
 # RAM/ROM/Flash chip drivers
@@ -203,6 +201,7 @@
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_ONENAND is not set
 
 CONFIG_MTD_REDBOOT_PARTS=m
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -216,6 +215,9 @@
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 # CONFIG_JFFS2_FS_WRITEBUFFER is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_SUMMARY=y
+
 
 #
 # Parallel port support
@@ -333,6 +335,7 @@
 CONFIG_BLK_DEV_CY82C693=y
 CONFIG_BLK_DEV_CS5520=y
 CONFIG_BLK_DEV_CS5530=y
+CONFIG_BLK_DEV_CS5535=y
 CONFIG_BLK_DEV_HPT34X=y
 CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_IT821X=y
@@ -384,6 +387,8 @@
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_RAID_ATTRS=m
 
+CONFIG_ISCSI_TCP=m
+
 #
 # SCSI low-level drivers
 #
@@ -1728,6 +1733,7 @@
 CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_TUNER_3036=m
 CONFIG_VIDEO_STRADIS=m
@@ -2624,3 +2630,33 @@
 
 CONFIG_IBMASR=m
 
+CONFIG_PM_LEGACY=y
+CONFIG_RFD_FTL=m
+# CONFIG_MTD_ONENAND is not set
+CONFIG_BLK_DEV_CS5535=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_PDC_ADMA=m
+CONFIG_SCSI_SATA_SIL24=m
+# CONFIG_ATM_DUMMY is not set
+CONFIG_PPP_MPPE=m
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+# CONFIG_TELCLOCK is not set
+CONFIG_RTC_X1205_I2C=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
+CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_AUDIO_DECODER=m
+CONFIG_VIDEO_DECODER=m
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_USB_LIBUSUAL=y
+CONFIG_USB_SERIAL_ANYDATA=m
+CONFIG_INFINIBAND_SRP=m
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-x86-generic	2 Jan 2006 02:02:31 -0000	1.16
+++ config-x86-generic	6 Jan 2006 05:42:19 -0000	1.17
@@ -71,7 +71,9 @@
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_HAVE_DEC_LOCK=y
-# CONFIG_X86_UP_APIC is not set
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_APIC_DEFAULT_OFF=y
+CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_PM_TIMER=y
 
 # CONFIG_EFI is not set
@@ -225,7 +227,9 @@
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
+
+# SHPC has half-arsed PCI probing, which makes it load on too many systems
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_PM=y


Index: config-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-x86_64	6 Feb 2005 05:49:11 -0000	1.1
+++ config-x86_64	6 Jan 2006 05:42:19 -0000	1.2
@@ -1,2 +0,0 @@
-# CONFIG_SMP is not set
-


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-x86_64-generic	6 Dec 2005 23:34:14 -0000	1.14
+++ config-x86_64-generic	6 Jan 2006 05:42:19 -0000	1.15
@@ -7,8 +7,9 @@
 CONFIG_MTRR=y
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=256
 CONFIG_GART_IOMMU=y
 CONFIG_X86_POWERNOW_K8=y
 CONFIG_IA32_EMULATION=y
@@ -16,6 +17,7 @@
 CONFIG_INIT_DEBUG=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_CHECKING is not set
+CONFIG_DEBUG_RODATA=y
 CONFIG_MICROCODE=m 
 CONFIG_SWIOTLB=y
 CONFIG_X86_PM_TIMER=y
@@ -38,7 +40,8 @@
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_PM_DEBUG is not set
+# FIXME: Disable this before release.
+CONFIG_PM_DEBUG=y
 
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -58,8 +61,6 @@
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 
 CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@@ -70,18 +71,14 @@
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
 
-CONFIG_CRASH=m
-
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_FAKE is not set
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -92,7 +89,8 @@
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
+# SHPC has half-arsed PCI probing, which makes it load on too many systems
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_HPET=y
@@ -103,15 +101,11 @@
 
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT=m
-CONFIG_IEEE80211_WPA=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
-# CONFIG_IPW_DEBUG is not set
-CONFIG_IPW2100_PROMISC=y
-# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2200=m
 
 CONFIG_PNP=y
@@ -125,6 +119,7 @@
 CONFIG_CRYPTO_AES_X86_64=m
 
 CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
 
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
@@ -142,3 +137,6 @@
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_ISA=m
 
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+

More information about the fedora-cvs-commits mailing list