rpms/kernel/FC-4/configs config-generic, 1.37, 1.38 config-ia64-generic, 1.4, 1.5 config-ppc-generic, 1.22, 1.23 config-ppc64-generic, 1.11, 1.12 config-x86-generic, 1.11, 1.12 config-x86_64-generic, 1.11, 1.12

Fri Oct 28 05:23:14 UTC 2005

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-ppc-generic 
	config-ppc64-generic config-x86-generic config-x86_64-generic 
Log Message:
rebase to 2.6.14




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38

--- config-generic	2 Oct 2005 21:15:02 -0000	1.37
+++ config-generic	28 Oct 2005 05:23:09 -0000	1.38
@@ -17,6 +17,7 @@
 #
 # General setup
 #
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
@@ -99,6 +100,8 @@
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
 CONFIG_INFINIBAND_USER_VERBS=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
 
 #
 # Executable file formats
@@ -378,6 +381,8 @@
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_RAID_ATTRS=m
 
 #
 # SCSI low-level drivers
@@ -412,6 +417,7 @@
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
@@ -426,6 +432,7 @@
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_QSTOR=m
+CONFIG_SCSI_SATA_MV=m
 
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
@@ -523,6 +530,7 @@
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
+CONFIG_FUSION_SAS=m
 
 #
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
@@ -577,6 +585,8 @@
 CONFIG_NET_KEY=m
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_IP_TCPDIAG=m
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -637,6 +647,9 @@
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -645,16 +658,9 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
-CONFIG_IP_NF_TARGET_CONNMARK=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_COMMENT=m
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -678,21 +684,17 @@
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_MATCH_SCTP=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_DCCP=m
+CONFIG_IP_NF_MATCH_CONNBYTES=m
+CONFIG_IP_NF_MATCH_STRING=m
+CONFIG_IP_NF_TARGET_CONNMARK=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
@@ -701,13 +703,32 @@
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_NFQUEUE=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_NETBIOS_NS=m
+CONFIG_IP_NF_PPTP=m
 
 #
 # IPv6: Netfilter Configuration
@@ -729,11 +750,13 @@
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
 CONFIG_IP6_NF_RAW=m
-
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_MARK=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_NFQUEUE=m
 
 #
 # Bridge: Netfilter Configuration
@@ -790,6 +813,10 @@
 CONFIG_NET_DIVERT=y
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
+CONFIG_IP_DCCP=m
+CONFIG_IP_DCCP_CCID3=m
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_DCCP_UNLOAD_HACK=y
 
 #
 # QoS and/or fair queueing
@@ -891,6 +918,13 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+CONFIG_PHYLIB=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_PHYCONTROL=y
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -919,7 +953,6 @@
 CONFIG_DE2104X=m
 CONFIG_TULIP=m
 # CONFIG_TULIP_NAPI is not set
-
 # CONFIG_TULIP_MWI is not set
 CONFIG_TULIP_MMIO=y
 # CONFIG_NI5010 is not set
@@ -928,6 +961,7 @@
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_ULI526X=m
 # CONFIG_AT1700 is not set
 CONFIG_DEPCA=m
 # CONFIG_HP100 is not set
@@ -971,6 +1005,7 @@
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_EPIC100=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
@@ -982,6 +1017,7 @@
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m
+CONFIG_CASSINI=m
 
 #
 # Ethernet (1000 Mbit)
@@ -1009,6 +1045,8 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 # CONFIG_2BUFF_MODE is not set
+CONFIG_CHELSIO_T1=m
+
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
 CONFIG_SKFP=m
@@ -1050,12 +1088,11 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211_CRYPT is not set
-# CONFIG_IEEE80211_WPA is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW_DEBUG is not set
 # CONFIG_IPW2100_PROMISC is not set
@@ -1065,6 +1102,7 @@
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -1074,11 +1112,18 @@
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
 CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
 
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+
 #
 # Token Ring devices
 #
@@ -1408,9 +1453,9 @@
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_TCG_TPM is not set
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_INFINEON is not set
 
 #
 # Serial drivers
@@ -1526,6 +1571,7 @@
 CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_HDAPS=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
@@ -1552,6 +1598,7 @@
 CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_W83792D=m
 
 CONFIG_W1=m 
 CONFIG_W1_MATROX=m 
@@ -1559,6 +1606,8 @@
 CONFIG_W1_DS9490_BRIDGE=m 
 CONFIG_W1_THERM=m
 CONFIG_W1_SMEM=m
+CONFIG_W1_DS2433=m
+CONFIG_W1_DS2433_CRC=y
 
 #
 # Mice
@@ -1603,10 +1652,12 @@
 CONFIG_SC1200_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_CPU5_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
 
-
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
@@ -1638,6 +1689,7 @@
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
 
@@ -1674,6 +1726,9 @@
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_SAA5249=m
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_TUNER_3036=m
 CONFIG_VIDEO_STRADIS=m
 CONFIG_VIDEO_ZORAN=m
@@ -1683,8 +1738,6 @@
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -1785,6 +1838,7 @@
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_DTT200U=m
 CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1810,6 +1864,7 @@
 # CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -1854,6 +1909,7 @@
 CONFIG_FB_NVIDIA_I2C=y
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_CYBLA=m
 
 #
 # Console display driver support
@@ -1884,10 +1940,11 @@
 CONFIG_SND=m
 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=m
 CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_RTCTIMER=m
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
@@ -1906,6 +1963,7 @@
 #
 CONFIG_SND_AD1816A=m
 CONFIG_SND_AD1848=m
+CONFIG_SND_AD1889=m
 CONFIG_SND_CS4231=m
 CONFIG_SND_CS4232=m
 CONFIG_SND_CS4236=m
@@ -2027,6 +2085,7 @@
 # USB Device Class drivers
 #
 # CONFIG_USB_AUDIO is not set
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 
 #
 # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
@@ -2045,6 +2104,7 @@
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_ONETOUCH=y
 
 #
 # USB Human Interface Devices (HID)
@@ -2097,7 +2157,15 @@
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_YEALINK=m
 CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_ZAURUS=m
 
 #
 # USB Host-to-Host Cables
@@ -2209,6 +2277,7 @@
 CONFIG_USB_PHIDGETKIT=m
 CONFIG_USB_MON=y
 CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ACECAD=m
 CONFIG_USB_ITMTOUCH=m
@@ -2289,6 +2358,7 @@
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
 CONFIG_DEBUG_FS=y
+CONFIG_RELAYFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -2313,6 +2383,8 @@
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
+CONFIG_9P_FS=m
+CONFIG_FUSE_FS=m
 
 #
 # Network File Systems
@@ -2494,6 +2566,7 @@
 #
 # Library routines
 #
+CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
 
@@ -2539,5 +2612,14 @@
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
+CONFIG_USB_APPLETOUCH=m
+
 CONFIG_INOTIFY=y
 
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+
+CONFIG_CONNECTOR=m
+
+CONFIG_IBMASR=m
+


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-ia64-generic	29 Sep 2005 23:07:41 -0000	1.4
+++ config-ia64-generic	28 Oct 2005 05:23:09 -0000	1.5
@@ -126,6 +126,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
 # CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -149,3 +150,16 @@
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 CONFIG_KPROBES=y
 
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+
+CONFIG_IA64_ACPI_CPUFREQ=m
+


Index: config-ppc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ppc-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-ppc-generic	29 Sep 2005 23:07:41 -0000	1.22
+++ config-ppc-generic	28 Oct 2005 05:23:09 -0000	1.23
@@ -198,3 +198,4 @@
 
 CONFIG_CAPI_EICON=y
 
+CONFIG_SND_POWERMAC_AUTO_DRC=y


Index: config-ppc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ppc64-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-ppc64-generic	29 Sep 2005 23:07:41 -0000	1.11
+++ config-ppc64-generic	28 Oct 2005 05:23:09 -0000	1.12
@@ -112,7 +112,9 @@
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_PIIX4=m
+# CONFIG_I2C_PMAC_SMU is not set
 
 # CONFIG_PPC_BPA is not set
 CONFIG_WATCHDOG_RTAS=m
 
+CONFIG_SND_POWERMAC_AUTO_DRC=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-x86-generic	29 Sep 2005 23:07:41 -0000	1.11
+++ config-x86-generic	28 Oct 2005 05:23:09 -0000	1.12
@@ -241,6 +241,7 @@
 # CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2100_PROMISC=y
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
+CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 
 CONFIG_BLK_DEV_AMD74XX=y
@@ -268,3 +269,6 @@
 CONFIG_I2C_VOODOO3=m
 
 # CONFIG_X86_REBOOTFIXUPS is not set
+
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x100000


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-x86_64-generic	29 Sep 2005 23:07:41 -0000	1.11
+++ config-x86_64-generic	28 Oct 2005 05:23:09 -0000	1.12
@@ -111,6 +111,7 @@
 # CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2100_PROMISC=y
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
+CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
 
 CONFIG_PNP=y


