rpms/kernel/F-9 config-generic,1.120,1.121 config-i686,1.3,1.4

Chuck Ebbert cebbert at fedoraproject.org
Thu Oct 30 10:03:15 UTC 2008 

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25102

Modified Files:
	config-generic config-i686 
Log Message:
fix configs to match old kernel


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- config-generic	30 Oct 2008 04:41:11 -0000	1.120
+++ config-generic	30 Oct 2008 10:02:44 -0000	1.121
@@ -427,7 +427,7 @@
 #
 # SCSI device support
 #
-CONFIG_SCSI=y
+CONFIG_SCSI=m
 
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_PROC_FS=y
@@ -445,12 +445,12 @@
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 
 #
@@ -506,13 +506,13 @@
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 
-CONFIG_ATA=y
+CONFIG_ATA=m
 CONFIG_ATA_SFF=y
-CONFIG_ATA_PIIX=y
+CONFIG_ATA_PIIX=m
 CONFIG_ATA_ACPI=y
 CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
-CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
@@ -636,18 +636,18 @@
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG=y
 # CONFIG_DM_DELAY is not set
-CONFIG_DM_MIRROR=y
+CONFIG_DM_MIRROR=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
 CONFIG_DM_MULTIPATH_HP=m
 CONFIG_DM_MULTIPATH_RDAC=m
-CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=y
+CONFIG_DM_ZERO=m
 
 #
 # Fusion MPT device support
@@ -786,11 +786,11 @@
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
@@ -808,7 +808,7 @@
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
@@ -828,7 +828,7 @@
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -857,8 +857,8 @@
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_CT_PROTO_DCCP=m
@@ -883,7 +883,7 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
@@ -892,8 +892,8 @@
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_RAW=m
 
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
 
 #
 # IPv6: Netfilter Configuration
@@ -1277,7 +1277,7 @@
 #
 # Wireless LAN
 #
-# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
@@ -1285,7 +1285,7 @@
 CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-CONFIG_MAC80211=y
+CONFIG_MAC80211=m
 CONFIG_MAC80211_QOS=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
 # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
@@ -1300,7 +1300,7 @@
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
 # CONFIG_MAC80211_DEBUG is not set
 
-CONFIG_IEEE80211=y
+CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
@@ -2466,18 +2466,18 @@
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=y
+CONFIG_SND=m
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_RTCTIMER=y
+CONFIG_SND_RTCTIMER=m
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 
@@ -2492,7 +2492,7 @@
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 
 CONFIG_SND_DRIVERS=y
 
@@ -2534,7 +2534,7 @@
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
@@ -2551,7 +2551,7 @@
 CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=y
+CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
@@ -2562,7 +2562,7 @@
 CONFIG_SND_NM256=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_RME32=m
-CONFIG_SND_PCSP=m
+# CONFIG_SND_PCSP is not set
 CONFIG_SND_PCXHR=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME96=m
@@ -2609,7 +2609,7 @@
 # DEPRECATED: See bug 362221. Fix udev.
 # CONFIG_USB_DEVICE_CLASS is not set
 
-CONFIG_USB_PERSIST=y
+# CONFIG_USB_PERSIST is not set
 
 #
 # Miscellaneous USB options
@@ -2621,13 +2621,13 @@
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_CS is not set
 # CONFIG_USB_R8A66597_HCD is not set
 
@@ -2894,11 +2894,11 @@
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=y
+CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_XATTR=y
@@ -3301,11 +3301,11 @@
 
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
-CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_SCHED=y
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_CGROUP_SCHED is not set
 # NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit.
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
 


Index: config-i686
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-i686,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-i686	30 Oct 2008 04:41:11 -0000	1.3
+++ config-i686	30 Oct 2008 10:02:44 -0000	1.4
@@ -3,6 +3,7 @@
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 
-CONFIG_CRYPTO_DEV_PADLOCK=m
+# temporarily disable padlock until bugs are fixed
+# CONFIG_CRYPTO_DEV_PADLOCK is not set
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m

More information about the scm-commits mailing list