Drop obsolete config options

2 files changed, 1 insertions, 145 deletions

diff --git a/config-generic b/config-generic
index 91ddd6868..9d4a6e3b3 100644
--- a/config-generic
+++ b/config-generic
@@ -45,7 +45,6 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_EXPERT is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y
@@ -92,7 +91,6 @@ CONFIG_PCI_STUB=y
 CONFIG_PCI_IOV=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_DEFAULT_ON=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
@@ -101,7 +99,6 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_PCI_LEGACY=y
 
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -118,7 +115,6 @@ CONFIG_YENTA=m
 CONFIG_CARDBUS=y
 CONFIG_I82092=m
 CONFIG_PD6729=m
-CONFIG_PCMCIA_IOCTL=y
 
 CONFIG_PCCARD=y
 CONFIG_MMC=m
@@ -195,9 +191,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_SWAP=m
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_AR7_PARTS=m
-CONFIG_MTD_CONCAT=m
 CONFIG_MTD_CMDLINE_PARTS=y
 #
 # User Modules And Translation Layers
@@ -488,7 +482,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_RAID_ATTRS=m
 
@@ -728,7 +721,6 @@ CONFIG_FIREWIRE_NOSY=m
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
 
 #
 # I2O device support
@@ -765,7 +757,6 @@ CONFIG_TCP_MD5SIG=y
 # Networking options
 #
 CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
@@ -929,7 +920,6 @@ CONFIG_BRIDGE_NETFILTER=y
 # IP: Netfilter Configuration
 #
 
-CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
@@ -955,7 +945,6 @@ CONFIG_NF_CT_PROTO_SCTP=m
 CONFIG_NF_CT_NETLINK=m
 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_TTL=m
@@ -1082,7 +1071,6 @@ CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_NET_DCCPPROBE=m
 
@@ -1306,7 +1294,6 @@ CONFIG_ATL1E=m
 CONFIG_E100=m
 CONFIG_FEALNX=m
 CONFIG_FORCEDETH=m
-CONFIG_FORCEDETH_NAPI=y
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 CONFIG_8139CP=m
@@ -1350,7 +1337,6 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKGE_GENESIS=y
@@ -1417,9 +1403,6 @@ CONFIG_SLIP_SMART=y
 #
 CONFIG_WLAN=y
 # CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
 # CONFIG_PCMCIA_RAYCS is not set
 
 CONFIG_WIRELESS=y
@@ -1431,7 +1414,6 @@ CONFIG_CFG80211_DEBUGFS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_NL80211=y
 # CONFIG_NL80211_TESTMODE is not set
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
@@ -1522,7 +1504,6 @@ CONFIG_LIBERTAS_MESH=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 CONFIG_IWLWIFI_DEVICE_SVTOOL=y
 # CONFIG_IWL_P2P is not set
 CONFIG_IWLAGN=m
@@ -1531,9 +1512,7 @@ CONFIG_IWLWIFI_LEGACY_DEBUG=y
 CONFIG_IWLWIFI_LEGACY_DEBUGFS=y
 # CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
 CONFIG_IWL4965=y
-CONFIG_IWL5000=y
 CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
@@ -1574,7 +1553,6 @@ CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_AR9170_USB=m
 
 CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
@@ -1586,9 +1564,6 @@ CONFIG_WL12XX_SDIO=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SDIO=m
-CONFIG_WL1271_SPI=m
 
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
@@ -1719,7 +1694,6 @@ CONFIG_WINBOND_FIR=m
 #
 CONFIG_BT=m
 CONFIG_BT_L2CAP=y
-CONFIG_BT_L2CAP_EXT_FEATURES=y
 CONFIG_BT_SCO=y
 CONFIG_BT_CMTP=m
 CONFIG_BT_RFCOMM=m
@@ -1844,8 +1818,6 @@ CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
 
 #
 # CAPI hardware drivers
@@ -2010,7 +1982,6 @@ CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MK712=m
-# CONFIG_TOUCHSCREEN_QT602240 is not set
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
@@ -2042,7 +2013,6 @@ CONFIG_MAC_EMUMOUSEBTN=y
 
 CONFIG_INPUT_WM831X_ON=m
 
-CONFIG_INPUT_APPLEIR=m
 
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_PCF8574 is not set
@@ -2090,19 +2060,12 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
-# CONFIG_COMPUTONE is not set
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-# CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
 # CONFIG_ISI is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
 # CONFIG_RIO is not set
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
 CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_MFD_HSU is not set
 
@@ -2153,7 +2116,6 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_ISCH is not set
@@ -2206,7 +2168,6 @@ CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
@@ -2477,7 +2438,6 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_I810=m
-# CONFIG_DRM_I830 is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_SAVAGE=m
@@ -2512,8 +2472,6 @@ CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_VIVI is not set
@@ -2559,17 +2517,13 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
-# CONFIG_VIDEO_OVCAMCHIP is not set
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_STRADIS=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_ZORAN=m
@@ -2592,9 +2546,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 #
 # Radio Adapters
 #
-CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 
@@ -2712,8 +2664,6 @@ CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_DM1105=m
-CONFIG_DVB_DRX397XD=m
-CONFIG_DVB_LGDT3304=m
 CONFIG_DVB_S921=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_LGS8GL5=m
@@ -3020,13 +2970,10 @@ CONFIG_SND_HDA_CODEC_CA0110=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
 CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_GENERIC=y
@@ -3035,7 +2982,6 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=y
@@ -3184,18 +3130,13 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_GREENASIA_FF=y
 CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_3M_PCT=y
 CONFIG_LOGIG940_FF=y
 CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MOSART=y
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
 CONFIG_HID_QUANTA=y
-CONFIG_HID_STANTUM=y
-CONFIG_HID_CANDO=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EGALAX=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_ORTEK=m
@@ -3239,10 +3180,7 @@ CONFIG_USB_MICROTEK=m
 #
 # USB Multimedia devices
 #
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
 
-CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 # CONFIG_USB_ET61X251 is not set
 CONFIG_USB_M5602=m
@@ -3262,7 +3200,6 @@ CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7311=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_USB_GSPCA_SONIXB=m
 CONFIG_USB_GSPCA_SONIXJ=m
 CONFIG_USB_GSPCA_SPCA500=m
@@ -3292,14 +3229,9 @@ CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_SE401=m
 
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-# CONFIG_USB_OV511 is not set
 CONFIG_USB_S2255=m
-CONFIG_USB_SE401=m
 # CONFIG_VIDEO_SH_MOBILE_CEU is not set
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
-# CONFIG_USB_STV680 is not set
 # CONFIG_USB_SN9C102 is not set
 CONFIG_USB_ZR364XX=m
 CONFIG_SOC_CAMERA=m
@@ -3435,7 +3367,6 @@ CONFIG_USB_SERIAL_QCAUX=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
 CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SAMBA=m
 
 CONFIG_USB_SERIAL_CONSOLE=y
 
@@ -3454,7 +3385,6 @@ CONFIG_USB_SEVSEG=m
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_ATM=m
-CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CYTHERM is not set
@@ -3464,7 +3394,6 @@ 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_GOKU is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -3472,7 +3401,6 @@ CONFIG_USB_FILE_STORAGE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
-CONFIG_USB_VST=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -3481,7 +3409,6 @@ CONFIG_USB_PWC=m
 CONFIG_USB_PWC_INPUT_EVDEV=y
 # CONFIG_USB_PWC_DEBUG is not set
 # CONFIG_USB_RIO500 is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_RADIO_SI470X=y
@@ -3496,7 +3423,6 @@ CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
-# CONFIG_USB_ZC0301 is not set
 CONFIG_USB_ZERO=m
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -3591,7 +3517,6 @@ CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
 # Autofsv3 is obsolete.
-# CONFIG_AUTOFS_FS is not set
 # systemd is dependant upon AUTOFS, so build it in.
 CONFIG_AUTOFS4_FS=y
 CONFIG_EXOFS_FS=m
@@ -3701,7 +3626,6 @@ CONFIG_NFSD_V4=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_LOCKD=m
@@ -3711,13 +3635,9 @@ CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPCSEC_GSS_SPKM3=m
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
@@ -3999,7 +3919,6 @@ CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_SCHED_AUTOGROUP=y
 
@@ -4008,14 +3927,13 @@ CONFIG_PROC_PID_CPUSET=y
 
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set 
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
 CONFIG_CGROUP_PERF=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
@@ -4043,12 +3961,10 @@ CONFIG_IBMASR=m
 
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
-# CONFIG_PM_VERBOSE is not set
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_RUNTIME=y
 
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -4118,7 +4034,6 @@ CONFIG_EWRK3=m
 # CONFIG_SKISA is not set
 # CONFIG_PROTEON is not set
 # CONFIG_SMCTR is not set
-# CONFIG_WAVELAN is not set
 # CONFIG_HISAX_16_0 is not set
 # CONFIG_HISAX_AVM_A1 is not set
 # CONFIG_HISAX_IX1MICROR2 is not set
@@ -4171,7 +4086,6 @@ CONFIG_RADIO_ADAPTERS=y
 # CONFIG_SND_AD1848 is not set
 # CONFIG_SND_CS4231 is not set
 CONFIG_SND_CS4236=m
-# CONFIG_SND_ES968 is not set
 # CONFIG_SND_ES1688 is not set
 # CONFIG_SND_ES18XX is not set
 # CONFIG_SND_GUSCLASSIC is not set
@@ -4190,9 +4104,7 @@ CONFIG_SND_SBAWE=m
 # CONFIG_SND_ALS100 is not set
 # CONFIG_SND_AZT2320 is not set
 # CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_DT019X is not set
 CONFIG_SND_OPL3SA2=m
-# CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
 CONFIG_SND_DARLA20=m
 CONFIG_SND_GINA20=m
@@ -4260,9 +4172,7 @@ CONFIG_DYNAMIC_FTRACE=y
 # CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_WORKQUEUE_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
-CONFIG_KMEMTRACE=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
@@ -4312,7 +4222,6 @@ CONFIG_AUXDISPLAY=y
 
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
-CONFIG_UIO_SMX=m
 # CONFIG_UIO_PDRV is not set
 # CONFIG_UIO_PDRV_GENIRQ is not set
 CONFIG_UIO_AEC=m
@@ -4326,20 +4235,14 @@ CONFIG_UIO_PCI_GENERIC=m
 # LIRC
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
-CONFIG_LIRC_ENE0100=m
-CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
-CONFIG_LIRC_IT87=m
-CONFIG_LIRC_ITE8709=m
-CONFIG_LIRC_MCEUSB=m
 CONFIG_LIRC_ZILOG=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SIR=m
-CONFIG_LIRC_STREAMZAP=m
 CONFIG_LIRC_TTUSBIR=m
 
 # CONFIG_SAMPLES is not set
@@ -4400,7 +4303,6 @@ CONFIG_OPTIMIZE_INLINING=y
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 
 # CONFIG_IP_VS_IPV6 is not set
@@ -4414,7 +4316,6 @@ CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_ACT_SKBEDIT=m
 
 CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
 
 CONFIG_ICS932S401=m
 # CONFIG_C2PORT is not set
@@ -4439,12 +4340,9 @@ CONFIG_USB_HWA_HCD=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
-CONFIG_UWB_WLP=m
 CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
 
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
 # CONFIG_VIDEO_TM6000 is not set
@@ -4452,31 +4350,20 @@ CONFIG_STAGING=y
 # CONFIG_WLAGS49_H25 is not set
 # CONFIG_VIDEO_DT3155 is not set
 # CONFIG_TI_ST is not set
-# CONFIG_ST_BT is not set
 # CONFIG_FB_XGI is not set
 # CONFIG_VIDEO_GO7007 is not set
-# CONFIG_USB_IP_COMMON is not set
 # CONFIG_DT3155 is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 CONFIG_USB_ATMEL=m
-# CONFIG_POCH is not set
-# CONFIG_OTUS is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_INPUT_MIMIO is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
-# CONFIG_B3DFG is not set
 # CONFIG_IDE_PHISON is not set
-# CONFIG_PLAN9AUTH is not set
 # CONFIG_LINE6_USB is not set
-# CONFIG_RTL8192SU is not set
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_RAR_REGISTER is not set
@@ -4488,7 +4375,6 @@ CONFIG_USB_ATMEL=m
 # CONFIG_HYPERV is not set
 # CONFIG_R8187SE is not set
 # CONFIG_RTL8192U is not set
-# CONFIG_RAMZSWAP is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_SPECTRA is not set
@@ -4496,7 +4382,6 @@ CONFIG_USB_ATMEL=m
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
 # CONFIG_ACPI_QUICKSTART is not set
-# CONFIG_BRCM80211 is not set
 # CONFIG_R8712U is not set
 # CONFIG_ATH6K_LEGACY is not set
 # CONFIG_USB_ENESTORAGE is not set
@@ -4521,10 +4406,8 @@ CONFIG_USB_ATMEL=m
 #
 
 # CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_BOOT_TRACER=y
 CONFIG_EARLY_PRINTK_DBGP=y
 
 CONFIG_SECURITYFS=y
@@ -4547,8 +4430,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 # CONFIG_PAGE_POISONING is not set
 
-CONFIG_SLOW_WORK=y
-CONFIG_SLOW_WORK_DEBUG=y
 
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRASH is not set
@@ -4557,7 +4438,6 @@ CONFIG_STRIP_ASM_SYMS=y
 
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
-CONFIG_SRCU_SYNCHRONIZE_DELAY=10
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 
 CONFIG_KSM=y
@@ -4601,7 +4481,6 @@ CONFIG_FB_UDL=m
 # from getting useful bug-reports makes it worth leaving them on.
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_SHIRQ=y
@@ -4609,7 +4488,6 @@ CONFIG_DEBUG_DEVRES=y
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DEBUG_BOOT_PARAMS=y
-CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -4645,18 +4523,14 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIO_RDC321X is not set
-# CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_GPIO_VX855 is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 
-CONFIG_KSYM_TRACER=y
-CONFIG_PROFILE_KSYM_TRACER=y
 CONFIG_KPROBE_EVENT=y
 
 # CONFIG_RAMOOPS is not set
 
-CONFIG_IR_CORE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
@@ -4671,20 +4545,17 @@ CONFIG_SPARSE_RCU_POINTER=y
 
 # CONFIG_PM_OPP is not set
 
-CONFIG_BKL=y
 
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 
 # CONFIG_XZ_DEC_TEST is not set
 
-CONFIG_NFC_DEVICES=y
 CONFIG_PN544_NFC=m
 CONFIG_NFC_PN533=m
 
 CONFIG_TARGET_CORE=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
diff --git a/config-x86-generic b/config-x86-generic
index 0f1216ede..4437ccbb4 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -55,13 +55,11 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_NMI_TIMEOUT=5
 
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=m
@@ -69,7 +67,6 @@ CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_POWER=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
@@ -78,7 +75,6 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 # CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_PNPACPI=y
-CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_APEI=y
@@ -246,7 +242,6 @@ CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_HVC_XEN=y
 CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
@@ -295,7 +290,6 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_PKGTEMP=m
 
 # CONFIG_CPA_DEBUG is not set
 
@@ -310,31 +304,24 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_MAXSMP is not set
 
-CONFIG_SYSPROF_TRACER=y
 
 CONFIG_HP_ILO=m
 
 CONFIG_BACKLIGHT_APPLE=m
 
-CONFIG_OPROFILE_IBS=y
 
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
 
 # CONFIG_CMDLINE_BOOL is not set
 
-CONFIG_X86_PTRACE_BTS=y
 
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 
-CONFIG_POWER_TRACER=y
-CONFIG_HW_BRANCH_TRACER=y
 
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
 CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
 
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
@@ -343,7 +330,6 @@ CONFIG_X86_MCE_AMD=y
 
 CONFIG_SFI=y
 
-CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_I2C_SCMI=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
 
@@ -361,7 +347,6 @@ CONFIG_PCI_CNB20LE_QUIRK=y
 CONFIG_ACPI_EC_DEBUGFS=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 # CONFIG_ACPI_QUICKSTART is not set
-CONFIG_IDEAPAD_ACPI=m
 
 CONFIG_INTEL_IDLE=y