rpms/kernel/F-11 config-generic, 1.298, 1.299 config-ia64-generic, 1.27, 1.28 config-powerpc-generic, 1.45, 1.46 config-powerpc32-generic, 1.32, 1.33 config-powerpc64, 1.30, 1.31 config-rhel-generic, 1.17, 1.18 config-s390x, 1.15, 1.16 config-sparc64-generic, 1.29, 1.30 config-x86-generic, 1.82, 1.83 config-x86_64-generic, 1.83, 1.84 kernel.spec, 1.1802, 1.1803
Chuck Ebbert
cebbert at fedoraproject.org
Wed Feb 3 04:12:12 UTC 2010
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv719
Modified Files:
config-generic config-ia64-generic config-powerpc-generic
config-powerpc32-generic config-powerpc64 config-rhel-generic
config-s390x config-sparc64-generic config-x86-generic
config-x86_64-generic kernel.spec
Log Message:
Update scripts/sort-config from devel
Remove obsolete config options
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- config-generic 29 Jan 2010 12:36:10 -0000 1.298
+++ config-generic 3 Feb 2010 04:12:10 -0000 1.299
@@ -37,7 +37,6 @@ CONFIG_LOG_BUF_SHIFT=17
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_KALLSYMS_STRIP_GENERATED=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_IOSCHED_NOOP=y
@@ -55,7 +54,6 @@ CONFIG_POSIX_MQUEUE=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_BKL=y
CONFIG_SLUB=y
# CONFIG_SLUB_STATS is not set
@@ -71,7 +69,6 @@ CONFIG_MODULE_UNLOAD=y
# -- MODULE_FORCE_UNLOAD is controlled by config-debug/nodebug
# CONFIG_MODVERSIONS is not set
CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KMOD=y
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -225,7 +222,6 @@ CONFIG_MTD_ABSENT=m
#
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
CONFIG_MTD_SC520CDP=m
CONFIG_MTD_NETSC520=m
# CONFIG_MTD_SBC_GXX is not set
@@ -360,12 +356,10 @@ CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_ATIIXP=y
CONFIG_LBD=y
CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_LSF=y
CONFIG_BLK_DEV_DELKIN=m
# CONFIG_BLK_DEV_IT8213 is not set
@@ -385,13 +379,9 @@ CONFIG_BLK_DEV_IDE=y
#
# Please see Documentation/ide.txt for help/info on IDE drives
#
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=y
CONFIG_IDE_TASK_IOCTL=y
# CONFIG_BLK_DEV_IDE_SATA is not set
@@ -402,7 +392,6 @@ CONFIG_BLK_DEV_CMD640=y
CONFIG_BLK_DEV_CMD640_ENHANCED=y
CONFIG_BLK_DEV_IDEPNP=y
CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_OPTI621 is not set
@@ -410,7 +399,6 @@ CONFIG_BLK_DEV_RZ1000=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_AEC62XX=y
CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_CMD64X=y
CONFIG_BLK_DEV_TRIFLEX=y
@@ -418,7 +406,6 @@ CONFIG_BLK_DEV_TRIFLEX=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
CONFIG_BLK_DEV_JMICRON=y
@@ -426,7 +413,6 @@ CONFIG_BLK_DEV_JMICRON=y
CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_NS87415 is not set
CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
CONFIG_BLK_DEV_PDC202XX_NEW=y
CONFIG_BLK_DEV_SVWKS=y
CONFIG_BLK_DEV_SIIMAGE=y
@@ -640,8 +626,6 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MOD
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_DC395x=m
# CONFIG_SCSI_NSP32 is not set
@@ -652,7 +636,6 @@ CONFIG_SCSI_QLA_ISCSI=m
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_DPT_I2O is not set
CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_SEAGATE is not set
#
# PCMCIA SCSI adapter support
@@ -676,7 +659,6 @@ 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_MULTICORE_RAID456=y
@@ -687,9 +669,6 @@ CONFIG_DM_DEBUG=y
# CONFIG_DM_DELAY is not set
CONFIG_DM_MIRROR=y
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_UEVENT=y
CONFIG_DM_ZERO=y
@@ -830,7 +809,6 @@ CONFIG_RDS_RDMA=m
CONFIG_RDS_TCP=m
CONFIG_NET_9P=m
-CONFIG_NET_9P_FD=m
CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_DEBUG is not set
CONFIG_NET_9P_RDMA=m
@@ -900,7 +878,6 @@ CONFIG_BRIDGE_NETFILTER=y
#
# IP: Netfilter Configuration
#
-CONFIG_NF_CONNTRACK_ENABLED=y
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
@@ -928,17 +905,11 @@ CONFIG_NF_CT_PROTO_UDPLITE=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_TTL=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_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
@@ -967,7 +938,6 @@ CONFIG_IP6_NF_MATCH_HL=m
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
CONFIG_IP6_NF_MATCH_MH=m
CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_OWNER=m
CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_RAW=m
@@ -1071,7 +1041,6 @@ CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_RR=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_TEQL=m
@@ -1082,7 +1051,6 @@ CONFIG_NET_CLS_CGROUP=y
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_RSVP=m
@@ -1119,7 +1087,6 @@ CONFIG_NET_DROP_MONITOR=y
CONFIG_NETDEVICES=y
# disable later --kyle
-CONFIG_COMPAT_NET_DEV_OPS=y
#
# ARCnet devices
@@ -1191,10 +1158,6 @@ CONFIG_BROADCOM_PHY=m
CONFIG_CICADA_PHY=m
CONFIG_DAVICOM_PHY=m
CONFIG_FIXED_PHY=y
-CONFIG_FIXED_MII_10_FDX=y
-CONFIG_FIXED_MII_100_FDX=y
-CONFIG_FIXED_MII_1000_FDX=y
-CONFIG_FIXED_MII_AMNT=1
CONFIG_MDIO_BITBANG=m
CONFIG_NATIONAL_PHY=m
CONFIG_ICPLUS_PHY=m
@@ -1226,7 +1189,6 @@ CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
CONFIG_TULIP_MMIO=y
# CONFIG_NI5010 is not set
-# CONFIG_PCMCIA_XIRTULIP is not set
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -1238,11 +1200,8 @@ CONFIG_NE3210=m
CONFIG_ES3210=m
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
-CONFIG_PCNET32_NAPI=y
CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
CONFIG_B44=m
CONFIG_B44_PCI=y
CONFIG_BNX2=m
@@ -1252,7 +1211,6 @@ CONFIG_ATL1=m
CONFIG_ATL1C=m
CONFIG_ATL2=m
CONFIG_ATL1E=m
-# CONFIG_EEPRO100 is not set
CONFIG_E100=m
CONFIG_FEALNX=m
CONFIG_FORCEDETH=m
@@ -1275,14 +1233,12 @@ CONFIG_SUNDANCE=m
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_RHINE_NAPI=y
CONFIG_VIA_VELOCITY=m
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_CASSINI=m
-# CONFIG_FEC_8XX is not set
CONFIG_ETHOC=m
# CONFIG_KS8842 is not set
# CONFIG_KS8851_MLL is not set
@@ -1294,20 +1250,15 @@ CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
CONFIG_E1000E=m
CONFIG_IGB=m
-# CONFIG_IGB_LRO is not set
CONFIG_IGB_DCA=y
CONFIG_IGBVF=m
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
CONFIG_R8169_VLAN=y
-# CONFIG_SK98LIN is not set
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_TIGON3=m
@@ -1320,11 +1271,9 @@ CONFIG_JME=m
#
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
CONFIG_CHELSIO_T3=m
CONFIG_IP1000=m
CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
CONFIG_IXGBE=m
CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
@@ -1333,7 +1282,6 @@ CONFIG_MYRI10GE_DCA=y
CONFIG_NETXEN_NIC=m
CONFIG_NIU=m
CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
CONFIG_VXGE=m
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
CONFIG_TEHUTI=m
@@ -1396,7 +1344,6 @@ CONFIG_LIB80211_CRYPT_TKIP=m
# CONFIG_LIB80211_DEBUG is not set
CONFIG_MAC80211=m
-CONFIG_MAC80211_QOS=y
CONFIG_MAC80211_RC_MINSTREL=y
# CONFIG_MAC80211_RC_DEFAULT_PID is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -1405,7 +1352,6 @@ CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_DEBUGFS=y
# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_DEFAULT_PS=y
CONFIG_WIMAX=m
CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1423,7 +1369,6 @@ CONFIG_AT76C50X_USB=m
CONFIG_AIRO=m
CONFIG_AIRO_CS=m
CONFIG_ATMEL=m
-# CONFIG_BCM43XX is not set
CONFIG_B43=m
CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
@@ -1459,20 +1404,14 @@ CONFIG_LIBERTAS_THINFIRM=m
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_IWLWIFI=m
CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI_RUN_TIME_CALIB=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEBUGFS=y
-CONFIG_IWLWIFI_RFKILL=y
CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
CONFIG_IWLAGN=m
CONFIG_IWL4965=y
CONFIG_IWL5000=y
-CONFIG_IWL5000_RUN_TIME_CALIB=y
CONFIG_IWL3945=m
-CONFIG_IWL3945_RFKILL=y
-CONFIG_IWL3945_DEBUG=y
CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
-CONFIG_IWL3945_LEDS=y
CONFIG_IWM=m
# CONFIG_IWM_DEBUG is not set
CONFIG_MAC80211_HWSIM=m
@@ -1493,19 +1432,11 @@ CONFIG_RT2X00=m
CONFIG_RT2X00_LIB_DEBUGFS=y
# CONFIG_RT2X00_DEBUG is not set
CONFIG_RT2400PCI=m
-CONFIG_RT2400PCI_RFKILL=y
-CONFIG_RT2400PCI_LEDS=y
CONFIG_RT2500PCI=m
-CONFIG_RT2500PCI_RFKILL=y
-CONFIG_RT2500PCI_LEDS=y
CONFIG_RT61PCI=m
-CONFIG_RT61PCI_RFKILL=y
-CONFIG_RT61PCI_LEDS=y
CONFIG_RT2500USB=m
-CONFIG_RT2500USB_LEDS=y
CONFIG_RT2800USB=m
CONFIG_RT73USB=m
-CONFIG_RT73USB_LEDS=y
CONFIG_RTL8180=m
CONFIG_RTL8187=m
CONFIG_TMD_HERMES=m
@@ -1524,7 +1455,7 @@ CONFIG_WL1271=m
#
# Token Ring devices
#
-# CONFIG_TR is not setk
+# CONFIG_TR is not set
# CONFIG_IBMOL is not set
# CONFIG_3C359 is not set
# Broken with gcc4.1
@@ -1536,7 +1467,6 @@ CONFIG_WL1271=m
CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
#
# Wan interfaces
@@ -1606,7 +1536,6 @@ CONFIG_ACTISYS_DONGLE=m
CONFIG_ACT200L_DONGLE=m
CONFIG_ESI_DONGLE=m
CONFIG_GIRBIL_DONGLE=m
-CONFIG_IRPORT_SIR=m
CONFIG_KINGSUN_DONGLE=m
CONFIG_KSDAZZLE_DONGLE=m
CONFIG_KS959_DONGLE=m
@@ -1616,7 +1545,6 @@ CONFIG_MCP2120_DONGLE=m
CONFIG_OLD_BELKIN_DONGLE=m
CONFIG_TEKRAM_DONGLE=m
CONFIG_TOIM3232_DONGLE=m
-# CONFIG_DONGLE_OLD is not set
CONFIG_ALI_FIR=m
CONFIG_MCS_FIR=m
@@ -1649,7 +1577,6 @@ CONFIG_BT_HIDP=m
CONFIG_BT_HCIBTUSB=m
# Disable the BT_HCIUSB driver.
# It sucks more power than BT_HCIBTUSB which has the same functionality.
-# CONFIG_BT_HCIUSB is not set
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
@@ -1658,7 +1585,6 @@ CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HCIUSB_SCO=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIBPA10X=m
@@ -1785,7 +1711,6 @@ CONFIG_GIGASET_BASE=m
CONFIG_GIGASET_M101=m
CONFIG_GIGASET_M105=m
# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GIGASET_UNDOCREQ is not set
#
# Telephony Support
@@ -1975,7 +1900,6 @@ CONFIG_CYCLADES=m
# CONFIG_ESPSERIAL is not set
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXA_SMARTIO_NEW is not set
# CONFIG_ISI is not set
# CONFIG_RISCOM8 is not set
# CONFIG_SPECIALIX is not set
@@ -2028,7 +1952,6 @@ CONFIG_I2C_ALGOPCA=m
# CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_I2C_ELEKTOR is not set
# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_NFORCE2_S4985 is not set
@@ -2045,8 +1968,6 @@ CONFIG_I2C_PASEMI=m
CONFIG_I2C_PCA_ISA=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
# CONFIG_SCx200_ACB is not set
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
@@ -2085,11 +2006,7 @@ CONFIG_SENSORS_ATXP1=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_DME1737=m
CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_DS1374=m
# CONFIG_DS1682 is not set
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
CONFIG_SENSORS_F71805F=m
CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
@@ -2119,11 +2036,8 @@ CONFIG_SENSORS_LM93=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6875=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8574=m
CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SIS5595=m
@@ -2186,9 +2100,7 @@ CONFIG_IPMI_POWEROFF=m
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
CONFIG_SOFT_WATCHDOG=m
-# CONFIG_WDT_501 is not set
CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_EUROTECH_WDT is not set
@@ -2355,7 +2267,6 @@ CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
@@ -2488,11 +2399,8 @@ CONFIG_DVB_PT1=m
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_VIDEO_TUNER=m
-# CONFIG_VIDEO_TUNER_CUSTOMISE is not set
CONFIG_VIDEO_BTCX=m
CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_24XXX=y
-CONFIG_VIDEO_PVRUSB2_29XXX=y
CONFIG_VIDEO_PVRUSB2_SYSFS=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
@@ -2504,7 +2412,6 @@ CONFIG_DISPLAY_SUPPORT=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=y
-CONFIG_VIDEO_SELECT=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_3DFX=m
CONFIG_FB_3DFX_ACCEL=y
@@ -2520,7 +2427,6 @@ CONFIG_FB_ATY_GENERIC_LCD=y
# CONFIG_FB_CARMINE is not set
CONFIG_FB_CIRRUS=m
# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_CYBLA is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
@@ -2528,7 +2434,6 @@ CONFIG_FB_I810=m
CONFIG_FB_I810_GTF=y
CONFIG_FB_I810_I2C=y
# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_IMAC is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_INTEL_DEBUG is not set
# CONFIG_FB_INTEL_I2C is not set
@@ -2540,7 +2445,6 @@ CONFIG_FB_MATROX_MYSTIQUE=y
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_I2C=m
CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
CONFIG_FB_NEOMAGIC=m
CONFIG_FB_NVIDIA=m
# CONFIG_FB_NVIDIA_DEBUG is not set
@@ -2565,7 +2469,6 @@ CONFIG_FB_SIS_315=y
CONFIG_FB_SM501=m
CONFIG_FB_TILEBLITTING=y
CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
CONFIG_FB_VGA16=m
@@ -2716,9 +2619,7 @@ CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=y
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
@@ -2739,7 +2640,6 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
#
# ALSA USB devices
@@ -2773,7 +2673,6 @@ CONFIG_USB_SUPPORT=y
# DEPRECATED: See bug 362221. Fix udev.
# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_PERSIST=y
#
# Miscellaneous USB options
@@ -2786,7 +2685,6 @@ CONFIG_USB_SUSPEND=y
# USB Host Controller Drivers
#
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_SPLIT_ISO=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_OHCI_HCD=y
@@ -2816,10 +2714,8 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y
CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_USB_STORAGE_FREECOM=y
CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
CONFIG_USB_STORAGE_SDDR09=y
CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_SIERRA=y
CONFIG_USB_STORAGE_JUMPSHOT=y
CONFIG_USB_STORAGE_USBAT=y
CONFIG_USB_STORAGE_ONETOUCH=y
@@ -2836,11 +2732,8 @@ CONFIG_HID_SUPPORT=y
CONFIG_HID=m
# debugging default is y upstream now
-CONFIG_HID_DEBUG=y
CONFIG_HIDRAW=y
-CONFIG_HID_FF=y
CONFIG_HID_PID=y
-# CONFIG_HID_COMPAT is not set
CONFIG_LOGITECH_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_PANTHERLORD_FF=y
@@ -2969,11 +2862,9 @@ CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_AIRPRIME=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -3043,7 +2934,6 @@ CONFIG_USB_SEVSEG=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_ATM=m
-CONFIG_USB_AUERSWALD=m
CONFIG_USB_BERRY_CHARGE=m
CONFIG_USB_CXACRU=m
# CONFIG_USB_C67X00_HCD is not set
@@ -3054,10 +2944,8 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_OXU210HP_HCD is not set
@@ -3068,10 +2956,6 @@ CONFIG_USB_LCD=m
CONFIG_USB_LD=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_MON=y
-CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
CONFIG_USB_PWC=m
CONFIG_USB_PWC_INPUT_EVDEV=y
# CONFIG_USB_PWC_DEBUG is not set
@@ -3090,7 +2974,6 @@ CONFIG_USB_STKWEBCAM=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_UVCVIDEO=m
CONFIG_USB_W9968CF=m
CONFIG_USB_XUSBATM=m
# CONFIG_USB_ZC0301 is not set
@@ -3150,7 +3033,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_XATTR=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4DEV_COMPAT=y
CONFIG_JBD2=y
CONFIG_FS_MBCACHE=y
CONFIG_REISERFS_FS=m
@@ -3169,7 +3051,6 @@ CONFIG_XFS_FS=m
# CONFIG_XFS_RT is not set
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_SECURITY=y
CONFIG_MINIX_FS=m
CONFIG_ROMFS_FS=m
CONFIG_QUOTA=y
@@ -3229,7 +3110,7 @@ CONFIG_DEBUG_FS=y
#
# Miscellaneous filesystems
#
-# CONFIG_ADFS_FS is not seta
+# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
CONFIG_ECRYPT_FS=m
CONFIG_HFS_FS=m
@@ -3253,7 +3134,6 @@ CONFIG_SQUASHFS=m
CONFIG_VXFS_FS=m
# CONFIG_HPFS_FS is not set
CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -3273,21 +3153,17 @@ CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
# CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
CONFIG_NFS_FSCACHE=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
-CONFIG_SUNRPC_BIND34=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNRPC_REGISTER_V4 is not set
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
# CONFIG_SMB_FS is not set
@@ -3312,7 +3188,6 @@ CONFIG_NCPFS_SMALLDOS=y
CONFIG_NCPFS_NLS=y
CONFIG_NCPFS_EXTRAS=y
CONFIG_CODA_FS=m
-# CONFIG_CODA_FS_OLD_API is not set
# CONFIG_AFS_FS is not set
# CONFIG_AF_RXRPC is not set
@@ -3322,7 +3197,6 @@ CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OCFS2_FS_STATS is not set
-# CONFIG_OCFS2_COMPAT_JBD is not set
CONFIG_OCFS2_FS_POSIX_ACL=y
CONFIG_BTRFS_FS=m
@@ -3445,7 +3319,6 @@ CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
# CONFIG_SECURITY_PATH is not set
-CONFIG_SECURITY_CAPABILITIES=y
CONFIG_SECURITY_FILE_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
CONFIG_SECURITY_SELINUX=y
@@ -3454,9 +3327,7 @@ CONFIG_SECURITY_SELINUX_DISABLE=y
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_AUDIT=y
@@ -3527,7 +3398,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# Random number generation
-CONFIG_CRYPTO_PRNG=m
#
# Library routines
@@ -3605,7 +3475,6 @@ CONFIG_PROC_EVENTS=y
CONFIG_IBMASR=m
-CONFIG_PM_LEGACY=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TRACE=y
# CONFIG_PM_VERBOSE is not set
@@ -3630,7 +3499,6 @@ CONFIG_SCSI_ARCMSR_AER=y
# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_T128 is not set
@@ -3720,17 +3588,13 @@ CONFIG_RADIO_ADAPTERS=y
# CONFIG_RADIO_ZOLTRIX is not set
# CONFIG_SND_OPL4_LIB is not set
-# CONFIG_SND_AD1848_LIB is not set
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-CONFIG_SND_CS4231_LIB=m
CONFIG_SND_CS4236=m
# CONFIG_SND_ES968 is not set
# CONFIG_SND_ES1688 is not set
# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_GUS_SYNTH is not set
# CONFIG_SND_GUSCLASSIC is not set
# CONFIG_SND_GUSEXTREME is not set
# CONFIG_SND_GUSMAX is not set
@@ -3768,25 +3632,17 @@ CONFIG_SND_INDIGODJX=m
## END of ISA options.
-# CONFIG_FORCED_INLINING is not set
CONFIG_MIGRATION=y
-CONFIG_RESOURCES_64BIT=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_AMS_DELTA is not set
-# CONFIG_LEDS_CORGI is not set
-# CONFIG_LEDS_IXP4XX is not set
# CONFIG_LEDS_LOCOMO is not set
# CONFIG_LEDS_NET48XX is not set
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_LP5521 is not set
# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_SPITZ is not set
-# CONFIG_LEDS_TOSA is not set
-CONFIG_LEDS_HP_DISK=m
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
@@ -3811,10 +3667,8 @@ CONFIG_UTRACE=y
CONFIG_FTRACE=y
# CONFIG_IRQSOFF_TRACER is not set
CONFIG_SCHED_TRACER=y
-CONFIG_PROCESS_TRACER=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_WORKQUEUE_TRACER=y
-CONFIG_EVENT_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_KMEMTRACE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -3862,11 +3716,8 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
-CONFIG_INSTRUMENTATION=y
-CONFIG_MARKERS=y
# CONFIG_CRC7 is not set
-CONFIG_DEFAULT_RELATIME=y
# LIRC
CONFIG_INPUT_LIRC=m
@@ -3896,7 +3747,6 @@ CONFIG_R6040=m
CONFIG_BNX2X=m
CONFIG_NOZOMI=m
-CONFIG_PCF8575=m
# CONFIG_TPS65010 is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
# CONFIG_KPROBES_SANITY_TEST is not set
@@ -3905,7 +3755,6 @@ CONFIG_LATENCYTOP=y
CONFIG_RESOURCE_COUNTERS=y
# CONFIG_COMPAT_BRK is not set
-CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
#FIXME: x86 generic?
CONFIG_LEDS_CLEVO_MAIL=m
@@ -3919,7 +3768,6 @@ CONFIG_ENCLOSURE_SERVICES=m
CONFIG_ISL29003=m
CONFIG_IPWIRELESS=m
CONFIG_RTC_DRV_DS1511=m
-CONFIG_CGROUP_MEM_CONT=y
# CONFIG_BLK_DEV_XIP is not set
CONFIG_MEMSTICK=m
@@ -3945,7 +3793,6 @@ CONFIG_OPTIMIZE_INLINING=y
# CONFIG_GPIOLIB is not set
-CONFIG_UNEVICTABLE_LRU=y
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
@@ -4010,9 +3857,6 @@ CONFIG_STAGING=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
# CONFIG_ET131X is not set
# CONFIG_SLICOSS is not set
-# CONFIG_SXG is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEILHAUS is not set
# CONFIG_VIDEO_GO7007 is not set
# CONFIG_USB_IP_COMMON is not set
# CONFIG_W35UND is not set
@@ -4020,11 +3864,9 @@ CONFIG_STAGING=y
# CONFIG_ECHO is not set
CONFIG_USB_ATMEL=m
# CONFIG_POCH is not set
-# CONFIG_AGNX is not set
# CONFIG_OTUS is not set
# CONFIG_RT2860 is not set
# CONFIG_RT2870 is not set
-# CONFIG_BENET is not set
# CONFIG_COMEDI is not set
# CONFIG_ASUS_OLED is not set
# CONFIG_PANEL is not set
@@ -4032,19 +3874,13 @@ CONFIG_USB_ATMEL=m
# CONFIG_RTL8187SE is not set
# CONFIG_INPUT_MIMIO is not set
# CONFIG_TRANZPORT is not set
-# CONFIG_EPL is not set
# CONFIG_POHMELFS is not set
-# CONFIG_USB_SERIAL_ATEN2011 is not set
# CONFIG_B3DFG is not set
# CONFIG_DST is not set
# CONFIG_IDE_PHISON is not set
# CONFIG_PLAN9AUTH is not set
-# CONFIG_HECI is not set
# CONFIG_LINE6_USB is not set
-# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
-# CONFIG_RT3070 is not set
# CONFIG_RTL8192SU is not set
-# CONFIG_COWLOOP is not set
# CONFIG_IIO is not set
# CONFIG_VME_BUS is not set
# CONFIG_RAR_REGISTER is not set
@@ -4071,7 +3907,6 @@ CONFIG_USB_ATMEL=m
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_FUNCTION_GRAPH_TRACER is not set
# CONFIG_BOOT_TRACER is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
CONFIG_EARLY_PRINTK_DBGP=y
CONFIG_SECURITYFS=y
@@ -4120,8 +3955,6 @@ CONFIG_PPS=m
# CONFIG_USB_SERIAL_QUATECH2 is not set
# CONFIG_VT6655 is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_RDC_17F3101X is not set
# CONFIG_FB_UDL is not set
# DEBUG options that don't get enabled/disabled with 'make debug/release'
Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-ia64-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- config-ia64-generic 4 Jan 2010 15:25:40 -0000 1.27
+++ config-ia64-generic 3 Feb 2010 04:12:11 -0000 1.28
@@ -8,9 +8,6 @@
CONFIG_IA64=y
CONFIG_64BIT=y
# CONFIG_XEN is not set
-# CONFIG_ARCH_XEN is not set
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
-# CONFIG_XEN_VT is not set
CONFIG_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_EFI=y
@@ -56,7 +53,6 @@ CONFIG_EFI_PCDP=y
#
# IDE chipset support/bugfixes
#
-CONFIG_IDE_MAX_HWIFS=4
CONFIG_BLK_DEV_SGIIOC4=y
#
@@ -104,7 +100,6 @@ CONFIG_AGP_SGI_TIOCA=y
# SGI
#
CONFIG_SGI_SNSC=y
-CONFIG_IA64_SGI_SN_XP=y
CONFIG_SGI_TIOCX=y
CONFIG_SGI_MBCS=m
CONFIG_SGI_IOC3=m
@@ -128,12 +123,10 @@ CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y
-# CONFIG_ACPI_BAY is not set
# CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_EC=y
CONFIG_ACPI_FAN=y
CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_NUMA=y
@@ -141,7 +134,6 @@ CONFIG_ACPI_POWER=y
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SYSTEM=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_TOSHIBA is not set
CONFIG_ACPI_VIDEO=m
@@ -177,7 +169,6 @@ CONFIG_IA64_ACPI_CPUFREQ=m
CONFIG_NODES_SHIFT=10
-# CONFIG_BCM43XX is not set
CONFIG_HW_RANDOM_INTEL=m
Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- config-powerpc-generic 4 Jan 2010 15:25:40 -0000 1.45
+++ config-powerpc-generic 3 Feb 2010 04:12:11 -0000 1.46
@@ -35,11 +35,9 @@ CONFIG_HIBERNATION=y
# CONFIG_RTC is not set
# CONFIG_GEN_RTC is not set
# CONFIG_GEN_RTC_X is not set
-CONFIG_RTC_DRV_PPC=y
CONFIG_RTC_DRV_GENERIC=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ELECTRA_IDE=y
CONFIG_ADB=y
CONFIG_ADB_PMU=y
@@ -105,7 +103,6 @@ CONFIG_MEMORY_HOTPLUG=y
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_BUSLOGIC is not set
-CONFIG_USB_HIDINPUT_POWERBOOK=y
# CONFIG_PPC_EARLY_DEBUG is not set
@@ -143,13 +140,9 @@ CONFIG_BLK_DEV_IDE=y
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_BLK_DEV_IDESCSI is not set
CONFIG_IDE_TASK_IOCTL=y
#
# IDE chipset support/bugfixes
@@ -157,7 +150,6 @@ CONFIG_IDE_TASK_IOCTL=y
# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_IDEPNP is not set
# CONFIG_BLK_DEV_IDEPCI is not set
-CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
@@ -166,7 +158,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
# CONFIG_BLK_DEV_SC1200 is not set
@@ -183,8 +174,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_VIA82CXXX is not set
CONFIG_BLK_DEV_IDE_PMAC=y
CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-CONFIG_BLK_DEV_IDEDMA_PMAC=y
-# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_BLK_DEV_HD is not set
# CONFIG_USB_STORAGE_ISD200 is not set
@@ -246,14 +235,10 @@ CONFIG_EXTRA_TARGETS=""
# CONFIG_I2C_CPM is not set
# CONFIG_I2C_GPIO is not set
# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_MT9M001_PCA9536_SWITCH is not set
-# CONFIG_MT9V022_PCA9536_SWITCH is not set
# CONFIG_LEDS_GPIO is not set
-# CONFIG_KGDB_CONSOLE is not set
# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_MAX732X is not set
-CONFIG_MDIO_OF_GPIO=m
CONFIG_SERIO_XILINX_XPS_PS2=m
Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc32-generic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- config-powerpc32-generic 4 Jan 2010 15:25:40 -0000 1.32
+++ config-powerpc32-generic 3 Feb 2010 04:12:11 -0000 1.33
@@ -4,9 +4,7 @@ CONFIG_PPC32=y
# CONFIG_RTAS_PROC is not set
# CONFIG_PCMCIA_M8XX is not set
# CONFIG_HOTPLUG_PCI is not set
-CONFIG_CLASSIC32=y
CONFIG_CPU_FREQ_PMAC=y
-CONFIG_PPC_MULTIPLATFORM=y
CONFIG_PPC_CHRP=y
CONFIG_PPC_PMAC=y
CONFIG_PPC_MPC52xx=y
@@ -19,7 +17,6 @@ CONFIG_SATA_FSL=m
# busted in .28git1
# ERROR: "cacheable_memzero" [drivers/net/gianfar_driver.ko] undefined!
# CONFIG_GIANFAR is not set
-CONFIG_GFAR_NAPI=y
CONFIG_USB_EHCI_FSL=y
CONFIG_PMAC_APM_EMU=y
@@ -54,7 +51,6 @@ CONFIG_THERM_WINDTUNNEL=m
CONFIG_THERM_ADT746X=m
# CONFIG_ANSLCD is not set
-CONFIG_SENSORS_M41T00=m
CONFIG_FB_PLATINUM=y
CONFIG_FB_VALKYRIE=y
CONFIG_FB_CT65550=y
@@ -69,7 +65,6 @@ CONFIG_FB_MATROX=y
# CONFIG_KEXEC is not set
# CONFIG_HVC_RTAS is not set
-# CONFIG_MAMBO is not set
# CONFIG_UDBG_RTAS_CONSOLE is not set
CONFIG_BRIQ_PANEL=m
@@ -87,7 +82,6 @@ CONFIG_SERIAL_MPC52xx=y
CONFIG_SERIAL_MPC52xx_CONSOLE=y
CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
# CONFIG_MPC5200_WDT is not set
-CONFIG_83xx_WDT=m
CONFIG_8xxx_WDT=m
CONFIG_GEF_WDT=m
@@ -121,7 +115,6 @@ CONFIG_PPC_BESTCOMM_GEN_BD=m
CONFIG_FORCE_MAX_ZONEORDER=11
# CONFIG_PAGE_OFFSET_BOOL is not set
-CONFIG_BLK_DEV_HD_ONLY=y
# CONFIG_FB_FSL_DIU is not set
CONFIG_IRQSTACKS=y
CONFIG_VIRTUALIZATION=y
@@ -178,7 +171,6 @@ CONFIG_MPC8610_HPCD=y
# drivers/mtd/maps/sbc8240.c: In function 'init_sbc8240_mtd':
# drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type
# drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module'
-# CONFIG_MTD_SBC8240 is not set
CONFIG_MTD_NAND_FSL_UPM=m
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc64,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- config-powerpc64 4 Jan 2010 15:25:40 -0000 1.30
+++ config-powerpc64 3 Feb 2010 04:12:11 -0000 1.31
@@ -3,9 +3,6 @@ CONFIG_WINDFARM_PM91=y
CONFIG_WINDFARM_PM121=y
CONFIG_PPC_PMAC64=y
CONFIG_PPC_MAPLE=y
-CONFIG_PPC_SYSTEMSIM=y
-CONFIG_BLK_DEV_SYSTEMSIM=m
-CONFIG_SYSTEMSIM_NET=m
CONFIG_PPC_CELL=y
CONFIG_PPC_IBM_CELL_BLADE=y
CONFIG_PPC_ISERIES=y
@@ -18,16 +15,12 @@ CONFIG_PPC_CELLEB=y
CONFIG_PPC_CELL_QPACE=y
CONFIG_PS3_HTAB_SIZE=20
# CONFIG_PS3_DYNAMIC_DMA is not set
-# CONFIG_PS3_USE_LPAR_ADDR is not set
CONFIG_PS3_ADVANCED=y
CONFIG_PS3_HTAB_SIZE=20
# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_USE_LPAR_ADDR=y
CONFIG_PS3_VUART=y
CONFIG_PS3_PS3AV=y
CONFIG_PS3_STORAGE=m
-CONFIG_PS3_STORAGE_EXPECTED_NUM_DRIVES=3
-CONFIG_PS3_STORAGE_MAX_SPINUP_WAIT_TIME=10
CONFIG_PS3_DISK=m
CONFIG_PS3_ROM=m
CONFIG_PS3_FLASH=m
@@ -69,15 +62,11 @@ CONFIG_SCSI_IPR_DUMP=y
CONFIG_SPIDER_NET=m
CONFIG_HVC_RTAS=y
CONFIG_HVC_ISERIES=y
-CONFIG_MAMBO=y
-CONFIG_MAMBO_DISK=m
-CONFIG_MAMBO_NET=m
CONFIG_CBE_RAS=y
# iSeries device drivers
#
CONFIG_ISERIES_VETH=m
-# CONFIG_VIOCONS is not set
CONFIG_VIODASD=m
CONFIG_VIOCD=m
CONFIG_VIOTAPE=m
@@ -154,7 +143,6 @@ CONFIG_ELECTRA_CF=m
CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_SPU_TRACE=m
CONFIG_MTD_NAND_PASEMI=m
CONFIG_EDAC_CELL=m
CONFIG_EDAC_CPC925=m
@@ -162,7 +150,6 @@ CONFIG_FRAME_WARN=2048
CONFIG_PHYP_DUMP=y
CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_BLK_DEV_HD_ONLY=y
CONFIG_VIRTUALIZATION=y
CONFIG_VSX=y
Index: config-rhel-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-rhel-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- config-rhel-generic 9 Dec 2008 22:43:52 -0000 1.17
+++ config-rhel-generic 3 Feb 2010 04:12:11 -0000 1.18
@@ -57,7 +57,6 @@
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
# CONFIG_SND_CS4236 is not set
# CONFIG_SND_ES968 is not set
# CONFIG_SND_ES1688 is not set
@@ -103,7 +102,6 @@
# CONFIG_ROCKETPORT is not set
# CONFIG_R3964 is not set
-# CONFIG_TIPAR is not set
# CONFIG_JOYSTICK_ANALOG is not set
# CONFIG_JOYSTICK_A3D is not set
@@ -117,8 +115,6 @@
# CONFIG_JOYSTICK_SIDEWINDER is not set
# CONFIG_JOYSTICK_TMDC is not set
# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_IFORCE_USB=y
-# CONFIG_JOYSTICK_IFORCE_232=y
# CONFIG_JOYSTICK_WARRIOR is not set
# CONFIG_JOYSTICK_MAGELLAN is not set
# CONFIG_JOYSTICK_SPACEORB is not set
@@ -136,8 +132,6 @@
# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MIROPCM20 is not set
-# CONFIG_RADIO_MIROPCM20_RDS is not set
# CONFIG_RADIO_SF16FMI is not set
# CONFIG_RADIO_SF16FMR2 is not set
# CONFIG_RADIO_TERRATEC is not set
@@ -145,7 +139,6 @@
# CONFIG_RADIO_TYPHOON is not set
# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_BWQCAM is not set
@@ -165,7 +158,6 @@
# CONFIG_VIDEO_MEYE is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DPC is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_CX88 is not set
@@ -190,7 +182,6 @@
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_HGA_ACCEL is not set
# CONFIG_FB_3DFX_ACCEL is not set
-# CONFIG_FB_TRIDENT_ACCEL is not set
# CONFIG_JFS_FS is not set
# CONFIG_NCP_FS is not set
Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-s390x,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- config-s390x 4 Jan 2010 15:25:40 -0000 1.15
+++ config-s390x 3 Feb 2010 04:12:11 -0000 1.16
@@ -17,16 +17,13 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_LOG_BUF_SHIFT=16
CONFIG_NO_IDLE_HZ=y
-CONFIG_NO_IDLE_HZ_INIT=y
CONFIG_SMP=y
#
# I/O subsystem configuration
#
-CONFIG_MACHCHK_WARNING=y
CONFIG_QDIO=m
-# CONFIG_QDIO_DEBUG is not set
#
# Misc
@@ -39,7 +36,6 @@ CONFIG_PFAULT=y
CONFIG_SHARED_KERNEL=y
CONFIG_CMM=m
CONFIG_CMM_PROC=y
-CONFIG_VIRT_TIMER=y
CONFIG_NETIUCV=m
CONFIG_SMSGIUCV=m
@@ -104,7 +100,6 @@ CONFIG_S390_TAPE_34XX=m
# Token Ring devices
#
CONFIG_TR=y
-# CONFIG_SHAPER is not set
CONFIG_NETCONSOLE=m
#
@@ -120,7 +115,6 @@ CONFIG_CTC=m
CONFIG_IUCV=m
CONFIG_QETH=m
CONFIG_QETH_IPV6=y
-CONFIG_QETH_VLAN=y
CONFIG_CCWGROUP=m
# CONFIG_IRDA is not set
@@ -128,7 +122,6 @@ CONFIG_CCWGROUP=m
# CONFIG_WIRELESS_EXT is not set
# CONFIG_WLAN_80211 is not set
# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
# CONFIG_B44 is not set
#
@@ -179,7 +172,6 @@ CONFIG_VMCP=m
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MII is not set
-# CONFIG_BOOT_DELAY is not set
CONFIG_STACK_GUARD=256
CONFIG_CMM_IUCV=y
@@ -203,7 +195,6 @@ CONFIG_S390_VMUR=m
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PAGE_STATES=y
CONFIG_CTCM=m
CONFIG_QETH_L2=m
CONFIG_QETH_L3=m
Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-sparc64-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- config-sparc64-generic 4 Jan 2010 15:25:40 -0000 1.29
+++ config-sparc64-generic 3 Feb 2010 04:12:11 -0000 1.30
@@ -35,13 +35,9 @@ CONFIG_NR_CPUS=256
CONFIG_US3_FREQ=m
CONFIG_US2E_FREQ=m
CONFIG_SUN_OPENPROMFS=m
-CONFIG_SPARC32_COMPAT=y
CONFIG_COMPAT=y
CONFIG_UID16=y
CONFIG_BINFMT_ELF32=y
-CONFIG_BINFMT_AOUT32=y
-CONFIG_SUNOS_EMUL=y
-CONFIG_SOLARIS_EMUL=m
CONFIG_ENVCTRL=m
CONFIG_DISPLAY7SEG=m
CONFIG_WATCHDOG_CP1XXX=m
@@ -50,12 +46,9 @@ CONFIG_WATCHDOG_RIO=m
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_PARPORT is not set
# CONFIG_BLK_DEV_FD is not set
-# CONFIG_LIRC_PVR150 is not set
# CONFIG_LIRC_PARALLEL is not set
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
# CONFIG_I2C_SIMTEC is not set
# CONFIG_I2C_VOODOO3 is not set
CONFIG_I2C_ALI1535=m
@@ -92,7 +85,6 @@ CONFIG_FB_XVR2500=y
# CONFIG_AGP is not set
# CONFIG_DRM_NOUVEAU is not set
# CONFIG_MDA_CONSOLE is not set
-# CONFIG_PROM_CONSOLE is not set
CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
# CONFIG_FONT_8x16 is not set
@@ -114,15 +106,12 @@ CONFIG_SERIAL_SUNSAB=y
CONFIG_SERIAL_SUNSAB_CONSOLE=y
CONFIG_SERIAL_SUNHV=y
CONFIG_SUN_OPENPROMIO=y
-CONFIG_SUN_MOSTEK_RTC=y
CONFIG_OBP_FLASH=m
-# CONFIG_SUN_VIDEOPIX is not set
# CONFIG_SERIO_SERPORT is not set
CONFIG_BLK_DEV_FD=y
CONFIG_SUNVDC=m
CONFIG_SUNVNET=m
# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -144,9 +133,6 @@ CONFIG_SUNQE=m
# CONFIG_DM9102 is not set
# CONFIG_HAMACHI is not set
# CONFIG_R8169 is not set
-CONFIG_ATM_FORE200E_SBA=y
-CONFIG_ATM_FORE200E_SBA_DEFAULT_FW=y
-# CONFIG_ATM_FORE200E_SBA_FW is not set
CONFIG_ATM_FORE200E_USE_TASKLET=y
CONFIG_ATM_FORE200E_DEBUG=0
CONFIG_ATM_FORE200E_TX_RETRY=16
@@ -161,7 +147,6 @@ CONFIG_SND_SUN_CS4231=m
# CONFIG_SND_SUN_DBRI is not set
CONFIG_PARPORT_SUNBPP=m
CONFIG_LOGO_SUN_CLUT224=y
-CONFIG_SUN_BPP=m
CONFIG_MTD_SUN_UFLASH=m
CONFIG_MYRI_SBUS=m
# CONFIG_SGI_IOC4 is not set
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86-generic,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- config-x86-generic 25 Jan 2010 17:38:24 -0000 1.82
+++ config-x86-generic 3 Feb 2010 04:12:11 -0000 1.83
@@ -8,13 +8,10 @@ CONFIG_UID16=y
#
# Enable summit and co via the generic arch
#
-# CONFIG_X86_PC is not set
-CONFIG_X86_GENERICARCH=y
CONFIG_X86_EXTENDED_PLATFORM=y
CONFIG_X86_32_NON_STANDARD=y
# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
CONFIG_X86_BIGSMP=y
@@ -36,7 +33,6 @@ CONFIG_M686=y
# CONFIG_MK8 is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
@@ -51,19 +47,15 @@ CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
-CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_HPET=y
CONFIG_HPET_TIMER=y
-# CONFIG_HPET_RTC_IRQ is not set
# CONFIG_HPET_MMAP is not set
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_TSC=y
CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-CONFIG_X86_MCE_P4THERMAL=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_SONYPI=m
@@ -140,12 +132,10 @@ CONFIG_APM=y
CONFIG_APM_CPU_IDLE=y
# CONFIG_APM_DISPLAY_BLANK is not set
# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
#
# Kernel debugging
#
-CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_ACPI=y
@@ -154,12 +144,10 @@ CONFIG_ACPI_AC=y
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BAY=y
CONFIG_ACPI_BLACKLIST_YEAR=1999
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_EC=y
CONFIG_ACPI_FAN=y
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PROCESSOR=y
@@ -167,7 +155,6 @@ CONFIG_ACPI_POWER=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SYSTEM=y
CONFIG_ACPI_THERMAL=y
CONFIG_TOPSTAR_LAPTOP=m
CONFIG_ACPI_TOSHIBA=m
@@ -195,11 +182,9 @@ CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
# CONFIG_X86_POWERNOW_K6 is not set
CONFIG_X86_POWERNOW_K7=y
CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
# CONFIG_X86_GX_SUSPMOD is not set
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y
@@ -213,9 +198,7 @@ CONFIG_X86_LONGRUN=y
# e_powersaver is dangerous
# CONFIG_X86_E_POWERSAVER is not set
-CONFIG_X86_SMP=y
CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
#
@@ -270,13 +253,10 @@ CONFIG_I2C_AMD756=m
CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
CONFIG_I2C_ISCH=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_PIIX4=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
@@ -325,7 +305,6 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_GEODE=m
CONFIG_HW_RANDOM_VIA=m
-CONFIG_USB_HIDINPUT_POWERBOOK=y
# CONFIG_COMPAT_VDSO is not set
@@ -366,7 +345,6 @@ CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
-CONFIG_KVM_TRACE=y
CONFIG_LGUEST=m
CONFIG_PARAVIRT_GUEST=y
@@ -407,7 +385,6 @@ CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
@@ -478,7 +455,6 @@ CONFIG_PERF_COUNTERS=y
CONFIG_PERF_EVENTS=y
CONFIG_EVENT_PROFILE=y
-# CONFIG_X86_OLD_MCE is not set
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y
# CONFIG_X86_ANCIENT_MCE is not set
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86_64-generic,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- config-x86_64-generic 25 Jan 2010 17:38:25 -0000 1.83
+++ config-x86_64-generic 3 Feb 2010 04:12:11 -0000 1.84
@@ -18,8 +18,7 @@ CONFIG_X86_64_ACPI_NUMA=y
# CONFIG_NUMA_EMU is not set
CONFIG_NR_CPUS=64
CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
-CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_P4_CLOCKMOD=m
CONFIG_IA32_EMULATION=y
# CONFIG_IA32_AOUT is not set
# CONFIG_IOMMU_DEBUG is not set
@@ -77,7 +76,6 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_DEBUG=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -87,12 +85,10 @@ CONFIG_ACPI_AC=y
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BAY=m
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_EC=y
CONFIG_ACPI_FAN=y
CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_NUMA=y
@@ -103,7 +99,6 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
CONFIG_ACPI_VIDEO=m
# Disable in F9.
CONFIG_ACPI_PROC_EVENT=y
@@ -129,7 +124,6 @@ CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
@@ -143,7 +137,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
CONFIG_HPET=y
# CONFIG_HPET_MMAP is not set
-# CONFIG_HPET_RTC_IRQ is not set
CONFIG_PM=y
CONFIG_IPW2100=m
@@ -181,7 +174,6 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_I801=m
CONFIG_I2C_ISCH=m
-# CONFIG_I2C_I810 is not set
CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_PIIX4=m
# CONFIG_I2C_SIS5595 is not set
@@ -225,7 +217,6 @@ CONFIG_HW_RANDOM_VIA=m
# CONFIG_HW_RANDOM_GEODE is not set
-CONFIG_USB_HIDINPUT_POWERBOOK=y
CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_DEBUG_NMI_TIMEOUT=5
@@ -249,7 +240,6 @@ CONFIG_MEMORY_HOTREMOVE=y
# CONFIG_BLK_DEV_CS5535 is not set
CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_ALL is not set
CONFIG_SGI_IOC4=m
CONFIG_SGI_XP=m
@@ -287,7 +277,6 @@ CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
-CONFIG_KVM_TRACE=y
CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y
@@ -326,8 +315,6 @@ CONFIG_HP_WATCHDOG=m
CONFIG_FRAME_WARN=2048
-CONFIG_MEMTEST_BOOTPARAM=y
-CONFIG_MEMTEST_BOOTPARAM_VALUE=0
CONFIG_NODES_SHIFT=9
CONFIG_X86_PAT=y
# FIXME: These should be 32bit only
@@ -375,7 +362,6 @@ CONFIG_HW_BRANCH_TRACER=y
CONFIG_X86_X2APIC=y
CONFIG_SPARSE_IRQ=y
-CONFIG_NUMA_MIGRATE_IRQ_DESC=y
CONFIG_RCU_FANOUT=64
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1802
retrieving revision 1.1803
diff -u -p -r1.1802 -r1.1803
--- kernel.spec 29 Jan 2010 12:36:10 -0000 1.1802
+++ kernel.spec 3 Feb 2010 04:12:11 -0000 1.1803
@@ -2008,6 +2008,10 @@ fi
# and build.
%changelog
+* Tue Feb 02 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.7-18
+- Update scripts/sort-config from devel
+- Remove obsolete config options
+
* Thu Jan 28 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.7-17
- Linux 2.6.32.7
- Disable CONFIG_DEVTMPFS
More information about the scm-commits
mailing list