Update to Linux v3.15

1 files changed, 84 insertions, 38 deletions

diff --git a/config-generic b/config-generic
index 207145926..b7ece128a 100644
--- a/config-generic
+++ b/config-generic
@@ -37,6 +37,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_COMPILE_TEST is not set
 CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
@@ -122,8 +123,8 @@ CONFIG_YENTA=m
 CONFIG_CARDBUS=y
 CONFIG_I82092=m
 CONFIG_PD6729=m
-
 CONFIG_PCCARD=y
+
 CONFIG_MMC=m
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
@@ -216,6 +217,8 @@ CONFIG_EXTRA_FIRMWARE=""
 
 # CONFIG_SPI is not set
 
+# CONFIG_SPMI is not set
+
 #
 # Memory Technology Devices (MTD)
 #
@@ -291,6 +294,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_BLOCK is not set
 
 #
 # Parallel port support
@@ -316,6 +320,7 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_LZ4_COMPRESS is not set
 # CONFIG_ZRAM_DEBUG is not set
 
 CONFIG_BLK_CPQ_DA=m
@@ -523,6 +528,11 @@ CONFIG_SCSI_LPFC=m
 # PCMCIA SCSI adapter support
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+
 CONFIG_ATA=y
 CONFIG_ATA_BMDMA=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -540,7 +550,7 @@ CONFIG_SATA_NV=m
 CONFIG_SATA_PMP=y
 CONFIG_SATA_PROMISE=m
 CONFIG_SATA_QSTOR=m
-CONFIG_SATA_RCAR=m
+# CONFIG_SATA_RCAR is not set
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
 CONFIG_SATA_SIS=m
@@ -602,6 +612,9 @@ CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
 CONFIG_PATA_ATP867X=m
 
+CONFIG_ATA_OVER_ETH=m
+
+# CONFIG_MCB is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -635,6 +648,7 @@ CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=m
 CONFIG_DM_CACHE_CLEANER=m
+# CONFIG_DM_ERA is not set
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 # CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_UEVENT=y
@@ -672,10 +686,6 @@ CONFIG_FIREWIRE_NOSY=m
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 
 #
-# IEEE 1394 (FireWire) support
-#
-
-#
 # I2O device support
 #
 # CONFIG_I2O is not set
@@ -1063,6 +1073,7 @@ CONFIG_IP_SET_BITMAP_IP=m
 CONFIG_IP_SET_BITMAP_IPMAC=m
 CONFIG_IP_SET_BITMAP_PORT=m
 CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
@@ -1074,7 +1085,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 
 #
-# SCTP Configuration (EXPERIMENTAL)
+# SCTP Configuration
 #
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
@@ -1191,6 +1202,7 @@ CONFIG_BATMAN_ADV=m
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
 
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
@@ -1299,6 +1311,8 @@ CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 
+CONFIG_ALTERA_TSE=m
+
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
@@ -1331,6 +1345,8 @@ CONFIG_CHELSIO_T4VF=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 
+# CONFIG_CX_ECAT is not set
+
 CONFIG_NET_VENDOR_DEC=y
 #
 # Tulip family network device support
@@ -1358,6 +1374,7 @@ CONFIG_SUNDANCE=m
 
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_BE2NET=m
+CONFIG_BE2NET_VXLAN=y
 
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
@@ -1433,6 +1450,7 @@ CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_VXLAN=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 
@@ -1452,6 +1470,7 @@ CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 
 # CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
 
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_SC92031=m
@@ -1460,6 +1479,8 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 
+CONFIG_NET_VENDOR_SMC=y
+
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
@@ -1511,6 +1532,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_BCM63XX_PHY=m
+CONFIG_BCM7XXX_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
@@ -1520,6 +1542,8 @@ CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
 CONFIG_VITESSE_PHY=m
 CONFIG_MICREL_PHY=m
+# CONFIG_OMAP_CONTROL_PHY is not set
+# CONFIG_PHY_SAMSUNG_USB2 is not set
 
 CONFIG_MII=m
 CONFIG_NET_CORE=y
@@ -1534,6 +1558,7 @@ CONFIG_ES3210=m
 CONFIG_NET_PCI=y
 CONFIG_B44=m
 CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
@@ -1553,6 +1578,7 @@ CONFIG_JME=m
 #
 # CONFIG_IP1000 is not set
 # CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_EN_VXLAN is not set
 # CONFIG_SFC is not set
 
 # CONFIG_FDDI is not set
@@ -1710,6 +1736,7 @@ CONFIG_LIBERTAS_MESH=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 CONFIG_IWLWIFI_DEVICE_SVTOOL=y
@@ -1731,6 +1758,10 @@ CONFIG_P54_PCI=m
 CONFIG_MWL8K=m
 # CONFIG_PRISM54 is not set
 # CONFIG_PCMCIA_WL3501 is not set
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
 CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
@@ -1778,6 +1809,7 @@ CONFIG_RTL8192SE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
 CONFIG_RTL8188EE=m
 
 CONFIG_MWIFIEX=m
@@ -1825,6 +1857,9 @@ CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
 
+#
+# Near Field Communication (NFC) devices
+#
 CONFIG_NFC=m
 CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_NCI=m
@@ -1832,18 +1867,16 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 CONFIG_NFC_LLCP=y
 CONFIG_NFC_SIM=m
+
 CONFIG_NFC_MRVL=m
 CONFIG_NFC_MRVL_USB=m
-
-#
-# Near Field Communication (NFC) devices
-#
 CONFIG_NFC_PORT100=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_TRF7970A=m
 
 #
 # IrDA (infrared) support
@@ -1887,6 +1920,7 @@ CONFIG_WINBOND_FIR=m
 # Bluetooth support
 #
 CONFIG_BT=m
+# CONFIG_BT_6LOWPAN is not set
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_CMTP=m
@@ -2404,6 +2438,7 @@ CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -2457,6 +2492,9 @@ CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
 CONFIG_SENSORS_LM95234=m
 CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4260=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
@@ -2567,12 +2605,15 @@ CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS=y
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_TSL2583 is not set
 # CONFIG_TSL2x7x is not set
+# CONFIG_LTR501 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_EXYNOS_ADC is not set
 # CONFIG_VIPERBOARD_ADC is not set
+# CONFIG_VF610_ADC is not set
+# CONFIG_XILINX_XADC is not set
 # CONFIG_INV_MPU6050_IIO is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
@@ -2584,6 +2625,7 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 # CONFIG_AK8975 is not set
 # CONFIG_MAG3110 is not set
 # CONFIG_TMP006 is not set
+# CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_IIO_ST_PRESS is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_AD7266 is not set
@@ -2617,6 +2659,7 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_DHT11 is not set
 # CONFIG_MPL3115 is not set
+# CONFIG_SI7005 is not set
 
 # staging IIO drivers
 # CONFIG_AD7291 is not set
@@ -2676,7 +2719,6 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
-# CONFIG_HDQ_MASTER_OMAP is not set
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_DS2408=m
@@ -2704,6 +2746,7 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_SI=m
+# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
 CONFIG_IPMI_POWEROFF=m
 
 #
@@ -2749,6 +2792,7 @@ CONFIG_WM831X_WATCHDOG=m
 CONFIG_W83697UG_WDT=m
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2819,7 +2863,7 @@ CONFIG_R3964=m
 # CONFIG_SONYPI is not set
 
 #
-# Ftape, the floppy tape device driver
+# AGP Support
 #
 CONFIG_AGP=y
 CONFIG_AGP_ALI=y
@@ -2872,6 +2916,7 @@ CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
+CONFIG_DRM_PTN3460=m
 
 #
 # PCMCIA character devices
@@ -2977,7 +3022,6 @@ CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_SAA7164=m
@@ -3128,8 +3172,10 @@ CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
+# CONFIG_IR_IMG is not set
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
 CONFIG_IR_ITE_CIR=m
@@ -3302,14 +3348,10 @@ CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_DRIVERS=y
 
 #
-# ISA devices
-#
-CONFIG_SND_AD1889=m
-
-#
 # PCI devices
 #
 CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
 CONFIG_SND_ALI5451=m
 CONFIG_SND_ALS300=m
 CONFIG_SND_ALS4000=m
@@ -3477,9 +3519,6 @@ CONFIG_USB_XHCI_HCD=y
 # USB Device Class drivers
 #
 
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
@@ -3502,7 +3541,7 @@ CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
 
 
 #
@@ -3570,6 +3609,7 @@ CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_HID_SENSOR_ALS=m
+# CONFIG_HID_SENSOR_PROX is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
@@ -3598,6 +3638,7 @@ CONFIG_HID_TIVO=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
 CONFIG_HID_APPLEIR=m
+# CONFIG_HID_CP2112 is not set
 
 
 #
@@ -3825,15 +3866,12 @@ CONFIG_USB_PHY=y
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
 # CONFIG_PHY_EXYNOS_DP_VIDEO is not set
-# CONFIG_OMAP_USB2 is not set
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_OMAP_CONTROL_USB is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_C67X00_HCD is not set
@@ -3954,6 +3992,10 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_RTSX_USB is not set
+# CONFIG_MFD_TPS65218 is not set
+
 
 #
 # File systems
@@ -4119,7 +4161,8 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
+# CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_CIFS=m
@@ -4479,7 +4522,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 
-CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -4526,7 +4568,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_NET_PRIO=m
+CONFIG_CGROUP_NET_PRIO=y
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_BLK_CGROUP=y
 
@@ -4559,7 +4601,6 @@ CONFIG_INOTIFY_USER=y
 #
 # Bus devices
 #
-# CONFIG_OMAP_OCP2SCP is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 
@@ -4592,7 +4633,6 @@ CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 
 
-CONFIG_NET_VENDOR_SMC=y
 # CONFIG_IBMTR is not set
 # CONFIG_SKISA is not set
 # CONFIG_PROTEON is not set
@@ -4691,6 +4731,7 @@ CONFIG_DW_DMAC_PCI=m
 # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_DMATEST is not set
+# CONFIG_FSL_EDMA is not set
 CONFIG_ASYNC_TX_DMA=y
 
 CONFIG_UNUSED_SYMBOLS=y
@@ -4894,7 +4935,6 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_I2C_BCM2048 is not set
 # CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_OMAP4 is not set
 # CONFIG_USB_MSI3101 is not set
 # CONFIG_DT3155 is not set
 # CONFIG_W35UND is not set
@@ -4924,6 +4964,10 @@ CONFIG_RTL8192E=m
 # CONFIG_R8188EU is not set
 # CONFIG_R8821AE is not set
 # CONFIG_RTL8192U is not set
+CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
+# CONFIG_8723AU_AP_MODE is not set
+# CONFIG_8723AU_P2P is not set
+# CONFIG_8723AU_BT_COEXIST is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_SPECTRA is not set
 # CONFIG_EASYCAP is not set
@@ -4944,6 +4988,8 @@ CONFIG_R8712U=m # Larry Finger maintains this (rhbz 699618)
 # CONFIG_RTS_PSTOR is not set
 CONFIG_ALTERA_STAPL=m
 # CONFIG_DVB_CXD2099 is not set
+# CONFIG_DVB_RTL2832_SDR is not set
+# CONFIG_PWM_FSL_FTM is not set
 # CONFIG_USBIP_CORE is not set
 # CONFIG_INTEL_MEI is not set
 # CONFIG_ZCACHE is not set
@@ -4967,6 +5013,10 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_DGAP is not set
 # CONFIG_DGNC is not set
 # CONFIG_RTS5208 is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_BT_NOKIA_H4P is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 # END OF STAGING
 
 #
@@ -4974,11 +5024,6 @@ CONFIG_ALTERA_STAPL=m
 #
 # CONFIG_STE_MODEM_RPROC is not set
 
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-
 CONFIG_NOP_USB_XCEIV=m
 
 # CONFIG_IMA is not set
@@ -5084,6 +5129,7 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_BCM_KONA is not set
 # CONFIG_GPIO_SCH311X is not set
+# CONFIG_GPIO_DWAPB is not set
 
 # FIXME: Why?
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y