rpms/kernel/devel/configs config-generic, 1.318, 1.319 config-i586, 1.23, 1.24 config-ia64-generic, 1.52, 1.53 config-powerpc-generic, 1.40, 1.41 config-powerpc64, 1.35, 1.36 config-s390-generic, 1.26, 1.27 config-x86-generic, 1.87, 1.88 config-x86_64-generic, 1.69, 1.70

Mon May 28 01:23:23 UTC 2007

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel/configs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20533/configs

Modified Files:
	config-generic config-i586 config-ia64-generic 
	config-powerpc-generic config-powerpc64 config-s390-generic 
	config-x86-generic config-x86_64-generic 
Log Message:
* Sun May 27 2007 Dave Jones <davej at redhat.com>
- Start F8 branch. Rebase to 2.6.22rc3



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319

--- config-generic	24 May 2007 01:58:47 -0000	1.318
+++ config-generic	28 May 2007 01:22:48 -0000	1.319
@@ -93,6 +93,7 @@
 CONFIG_PCCARD=y
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_SDHCI=m
@@ -114,6 +115,7 @@
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_MLX4_INFINIBAND=m
 
 #
 # Executable file formats
@@ -155,6 +157,12 @@
 CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
+
 #
 # RAM/ROM/Flash chip drivers
 #
@@ -213,6 +221,8 @@
 # NAND Flash Device Drivers
 #
 CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_IDS=m
@@ -473,6 +483,7 @@
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
@@ -561,22 +572,23 @@
 #
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
+CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG=y
-CONFIG_DM_SNAPSHOT=m
+# CONFIG_DM_DELAY is not set
 CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_CRYPT=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_ZERO=m
 
 #
 # Fusion MPT device support
@@ -615,14 +627,16 @@
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=y
 CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
 CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_VEGAS=m
 CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_YEAH=m
 
 CONFIG_TCP_MD5SIG=y
 
@@ -690,6 +704,7 @@
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -991,6 +1006,7 @@
 #
 # ATM
 #
+CONFIG_ATM_DRIVERS=y
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1009,8 +1025,6 @@
 CONFIG_PPPOATM=m
 CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_IA is not set
-
-
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 # CONFIG_ATM_MPOA is not set
 # CONFIG_ATM_BR2684_IPFILTER is not set
@@ -1027,10 +1041,15 @@
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
 
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
+
 
 #
 # Ethernet (10 or 100Mbit)
 #
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 CONFIG_NET_ETHERNET=y
 CONFIG_PHYLIB=m
 CONFIG_BROADCOM_PHY=m
@@ -1191,13 +1210,13 @@
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 CONFIG_CFG80211=m
-# CONFIG_NL80211 is not set
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_USB_ZD1201=m
-# CONFIG_ZD1211RW is not set
+
+CONFIG_ADM8211=m
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_ATMEL=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
 CONFIG_BCM43XX_MAC80211=m
 CONFIG_BCM43XX_MAC80211_PCI=y
 CONFIG_BCM43XX_MAC80211_PCMCIA=y
@@ -1207,48 +1226,52 @@
 CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
 # CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
 # CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
-CONFIG_RT2X00=y
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_ADM8211=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_ZD1211RW_MAC80211=m
-# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
-CONFIG_RTL818X=y
-CONFIG_RTL8187=m
+CONFIG_HERMES=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_IPW2100_DEBUG is not set
+# CONFIG_IPW2200_DEBUG is not set
+# FIXME: Move to x86[64]-generic
 CONFIG_IWLWIFI=y
 CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWL4965 is not set
 CONFIG_IWL3945=m
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_USB_DEBUG is not set
+# CONFIG_NL80211 is not set
 CONFIG_NORTEL_HERMES=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
 CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
+CONFIG_PLX_HERMES=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
+CONFIG_RT2X00=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_TMD_HERMES=m
+CONFIG_USB_ZD1201=m
+# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
 
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_CS=m
 
 #
 # Token Ring devices
@@ -1303,18 +1326,19 @@
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRTTY_SIR=m
 CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_ESI_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
 CONFIG_IRPORT_SIR=m
-# CONFIG_DONGLE_OLD is not set
+CONFIG_KINGSUN_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
 CONFIG_MCP2120_DONGLE=m
 CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+# CONFIG_DONGLE_OLD is not set
 
 CONFIG_ALI_FIR=m
 CONFIG_MCS_FIR=m
@@ -1486,6 +1510,17 @@
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_POLLDEV=m
+
 #
 # Input I/O drivers
 #
@@ -1515,8 +1550,10 @@
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_ANALOG=m
 CONFIG_JOYSTICK_A3D=m
@@ -1542,6 +1579,7 @@
 CONFIG_JOYSTICK_TURBOGRAFX=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_XPAD=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -1551,12 +1589,17 @@
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+
 CONFIG_MAC_EMUMOUSEBTN=y
 
 #
@@ -1662,6 +1705,8 @@
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_TINY_USB is not set
 
 # CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_PARPORT=m
@@ -1678,14 +1723,17 @@
 # I2C Hardware Sensors Chip support
 #
 CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_DS1337=m
 CONFIG_SENSORS_DS1374=m
@@ -1709,6 +1757,7 @@
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6875=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
@@ -1795,22 +1844,25 @@
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-CONFIG_RTC=y
+# CONFIG_RTC is not set
 # CONFIG_RTC_DEBUG is not set
+CONFIG_GEN_RTC=m
+CONFIG_GEN_RTC_X=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_SYSFS=m
-CONFIG_RTC_INTF_PROC=m
-CONFIG_RTC_INTF_DEV=m
-# FIXME: Disable _RTC for F7+ and enable DRV_CMOS
-# CONFIG_RTC_DRV_CMOS is not set
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_DS1742=m
 # CONFIG_RTC_DRV_EP93XX is not set
 CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -1819,7 +1871,6 @@
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1883,6 +1934,9 @@
 #
 # Video Adapters
 #
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
 CONFIG_VIDEO_BWQCAM=m
@@ -1942,7 +1996,7 @@
 #
 # Digital Video Broadcasting Devices
 #
-CONFIG_DVB=y
+CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
 CONFIG_DVB_CORE_ATTACH=y
 
@@ -2012,6 +2066,7 @@
 CONFIG_DVB_USB_GP8PSK=m
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
@@ -2041,11 +2096,15 @@
 #
 # Graphics support
 #
+
+CONFIG_DISPLAY_SUPPORT=m
+
 CONFIG_FB=y
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_ACCEL=y
 # CONFIG_FB_ARC is not set
+# CONFIG_FB_ARK is not set
 CONFIG_FB_ATY128=m
 CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
@@ -2056,6 +2115,7 @@
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_CYBLA=m
 # CONFIG_FB_GEODE is not set
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
@@ -2066,6 +2126,7 @@
 # CONFIG_FB_INTEL_DEBUG is not set
 CONFIG_FB_INTEL_I2C=y
 CONFIG_FB_KYRO=m
+# CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2075,9 +2136,11 @@
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_NVIDIA=m
+# CONFIG_FB_NVIDIA_DEBUG is not set
 CONFIG_FB_NVIDIA_I2C=y
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+# CONFIG_FB_PM3 is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
@@ -2100,6 +2163,8 @@
 CONFIG_FB_VGA16=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VOODOO1=m
+# CONFIG_FB_VT8623 is not set
+
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -2169,60 +2234,65 @@
 #
 # PCI devices
 #
+CONFIG_SND_ADLIB=m
 CONFIG_SND_ALI5451=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
 CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS4281=m
 CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
-CONFIG_SND_CA0106=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
 CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDSPM=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MIRO=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_RME32=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
 CONFIG_SND_SONICVIBES=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_TRIDENT=m
 CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ADLIB=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_RIPTIDE=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
 
 #
 # ALSA USB devices
 #
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_USX2Y=m
 
 #
@@ -2241,6 +2311,7 @@
 #
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
+# CONFIG_USB_DEVICE_CLASS is not set
 
 #
 # Miscellaneous USB options
@@ -2307,13 +2378,6 @@
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
-CONFIG_USB_AIPTEK=m
-
-CONFIG_USB_WACOM=m
-
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_XPAD=m
 
 #
 # USB Imaging devices
@@ -2324,7 +2388,9 @@
 #
 # USB Multimedia devices
 #
+CONFIG_DAB=y
 CONFIG_USB_DABUSB=m
+
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_ET61X251=m
@@ -2334,6 +2400,7 @@
 CONFIG_USB_SE401=m
 CONFIG_USB_STV680=m
 CONFIG_USB_SN9C102=m
+CONFIG_USB_ZR364XX=m
 
 #
 # USB Network adaptors
@@ -2344,8 +2411,6 @@
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_SPEEDTOUCH=m
-# Has dumb detection, which gets loaded for every hid device.
-# CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
@@ -2460,8 +2525,6 @@
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_ATI_REMOTE=m
-CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_FTDI_ELAN=m
@@ -2476,15 +2539,11 @@
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ACECAD=m
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
-CONFIG_USB_APPLETOUCH=m
-CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2631,6 +2690,7 @@
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_SUNRPC=m
+CONFIG_SUNRPC_BIND34=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
@@ -2655,7 +2715,7 @@
 CONFIG_CODA_FS=m
 # CONFIG_CODA_FS_OLD_API is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_RXRPC is not set
+# CONFIG_AF_RXRPC is not set
 
 CONFIG_OCFS2_FS=m
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
@@ -2672,21 +2732,22 @@
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
 CONFIG_AMIGA_PARTITION=y
 # CONFIG_ATARI_PARTITION is not set
+CONFIG_BSD_DISKLABEL=y
+CONFIG_EFI_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+# CONFIG_LDM_PARTITION is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
 CONFIG_MINIX_SUBPARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_SGI_PARTITION=y
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SUN_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
 # CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_KARMA_PARTITION=y
 
 CONFIG_NLS=y
 
@@ -2792,7 +2853,7 @@
 #
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_MANAGER=m
-
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
@@ -2826,7 +2887,6 @@
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
 
@@ -2910,6 +2970,7 @@
 # CONFIG_SCSI_IN2000 is not set
 CONFIG_SCSI_ARCMSR=m
 # CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
 # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 # CONFIG_SCSI_NCR53C406A is not set
@@ -2990,6 +3051,7 @@
 # CONFIG_WDT is not set
 
 # CONFIG_VIDEO_PMS is not set
+# CONFIG_RADIO_ADAPTERS is not set
 # CONFIG_RADIO_CADET is not set
 # CONFIG_RADIO_RTRACK is not set
 # CONFIG_RADIO_RTRACK2 is not set
@@ -3093,3 +3155,7 @@
 CONFIG_CFAG12864B=y
 CONFIG_CFAG12864B_RATE=20
 
+# CONFIG_PHANTOM is not set
+# CONFIG_BLINK is not set
+
+


Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-i586	22 Feb 2007 21:17:27 -0000	1.23
+++ config-i586	28 May 2007 01:22:48 -0000	1.24
@@ -38,3 +38,5 @@
 # CONFIG_AGP_SWORKS is not set
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
+# CONFIG_NETDEV_10000 is not set
+


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- config-ia64-generic	5 Mar 2007 07:41:08 -0000	1.52
+++ config-ia64-generic	28 May 2007 01:22:48 -0000	1.53
@@ -182,3 +182,4 @@
 # drivers/media/video/usbvision/usbvision-i2c.c:64:39: error: macro "outb" passed 4 arguments, but takes just 2
 # CONFIG_VIDEO_USBVISION is not set
 
+# CONFIG_IA64_MC_ERR_INJECT is not set


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- config-powerpc-generic	27 Mar 2007 23:57:26 -0000	1.40
+++ config-powerpc-generic	28 May 2007 01:22:48 -0000	1.41
@@ -195,3 +195,13 @@
 # CONFIG_SATA_INTEL_COMBINED is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_MTD_PHYSMAP_OF=m
+# CONFIG_IDE_PROC_FS is not set
+CONFIG_MACINTOSH_DRIVERS=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+
+CONFIG_PPC_PASEMI_MDIO=m
+CONFIG_SPU_FS_64K_LS=y
+CONFIG_PPC_PASEMI_CPUFREQ=y
+CONFIG_PMAC_APM_EMU=m
+CONFIG_HW_RANDOM_PASEMI=m
+


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config-powerpc64	4 May 2007 14:52:46 -0000	1.35
+++ config-powerpc64	28 May 2007 01:22:48 -0000	1.36
@@ -91,3 +91,5 @@
 
 CONFIG_PATA_SCC=m
 
+CONFIG_APM_EMULATION=m
+


Index: config-s390-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-s390-generic	8 Mar 2007 23:01:16 -0000	1.26
+++ config-s390-generic	28 May 2007 01:22:48 -0000	1.27
@@ -35,6 +35,7 @@
 #
 # CONFIG_SCSI_SATA is not set
 CONFIG_ZFCP=m
+CONFIG_ZFCPDUMP=m
 CONFIG_CCW=y
 
 #


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- config-x86-generic	25 Apr 2007 20:55:31 -0000	1.87
+++ config-x86-generic	28 May 2007 01:22:48 -0000	1.88
@@ -61,7 +61,9 @@
 CONFIG_X86_MCE_P4THERMAL=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
+CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI=m
+CONFIG_SONYPI_COMPAT=y
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
@@ -325,8 +327,11 @@
 CONFIG_MTD_CK804XROM=m
 CONFIG_MTD_NAND_CAFE=m
 
-CONFIG_SONY_LAPTOP=m
-
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+CONFIG_THINKPAD_ACPI_BAY=y
+
+CONFIG_MACINTOSH_DRIVERS=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- config-x86_64-generic	25 Apr 2007 20:55:31 -0000	1.69
+++ config-x86_64-generic	28 May 2007 01:22:48 -0000	1.70
@@ -87,7 +87,12 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_VIDEO=m
 CONFIG_ASUS_LAPTOP=m
+CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+CONFIG_THINKPAD_ACPI_BAY=y
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -196,7 +201,6 @@
 
 CONFIG_SGI_IOC4=m
 # CONFIG_SGI_IOC4 is not set
-CONFIG_MSI_LAPTOP=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
@@ -209,3 +213,7 @@
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+
+CONFIG_RELOCATABLE=y
+CONFIG_MACINTOSH_DRIVERS=y
+


