diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-10-03 07:41:45 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-10-03 07:41:45 +0100 |
| commit | 03b0b30e0bce22b485a78cb87af9a5019adf66f9 (patch) | |
| tree | 35462d845c11e1c971904eb7bbed115d341bd2f1 /config-generic | |
| parent | 57bf058dba8870086227098ce3b687657c92d973 (diff) | |
| download | kernel-03b0b30e0bce22b485a78cb87af9a5019adf66f9.tar.gz kernel-03b0b30e0bce22b485a78cb87af9a5019adf66f9.tar.xz kernel-03b0b30e0bce22b485a78cb87af9a5019adf66f9.zip | |
ARM config cleanups, some minor general cleanups
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/config-generic b/config-generic index c9d6e6ed0..c02e93084 100644 --- a/config-generic +++ b/config-generic @@ -233,7 +233,6 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set - # Give this a try in rawhide for now # CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set @@ -1626,7 +1625,6 @@ CONFIG_NET_VENDOR_SIS=y CONFIG_SIS900=m CONFIG_SIS190=m - CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -1685,7 +1683,6 @@ CONFIG_BCM63XX_PHY=m CONFIG_BCM7XXX_PHY=m CONFIG_INTEL_XWAY_PHY=m # CONFIG_MDIO_HISI_FEMAC is not set -# CONFIG_MDIO_XGENE is not set CONFIG_LSI_ET1011C_PHY=m CONFIG_LXT_PHY=m CONFIG_MARVELL_PHY=m @@ -1730,7 +1727,6 @@ CONFIG_JME=m # Ethernet (10000 Mbit) # CONFIG_NET_VENDOR_AURORA is not set -# CONFIG_MLX4_CORE=m CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y @@ -1773,7 +1769,6 @@ CONFIG_SLIP_SMART=y # # Wireless LAN # -# CONFIG_WLAN=y # CONFIG_STRIP is not set # CONFIG_PCMCIA_RAYCS is not set @@ -2223,8 +2218,6 @@ CONFIG_BT_HIDP=m # Bluetooth device drivers # CONFIG_BT_HCIBTUSB=m -# Disable the BT_HCIUSB driver. -# It sucks more power than BT_HCIBTUSB which has the same functionality. CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIUART=m @@ -2264,20 +2257,19 @@ CONFIG_MISDN_SPEEDFAX=m CONFIG_MISDN_INFINEON=m CONFIG_MISDN_W6692=m CONFIG_MISDN_NETJET=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m # # mISDN hardware drivers # -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m CONFIG_ISDN_I4L=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m CONFIG_ISDN_DRV_AVMB1_T1PCI=m CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_MISDN_HFCUSB=m - CONFIG_ISDN_PPP=y CONFIG_ISDN_PPP_VJ=y CONFIG_ISDN_MPP=y @@ -5497,8 +5489,8 @@ CONFIG_LEDS_WM831X_STATUS=m CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC_PCI=m # CONFIG_IDMA64 is not set # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set @@ -5509,9 +5501,7 @@ CONFIG_DW_DMAC_PCI=m CONFIG_ASYNC_TX_DMA=y # CONFIG_HSU_DMA is not set # CONFIG_HSU_DMA_PCI is not set -# CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set -# CONFIG_XILINX_ZYNQMP_DMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_HIDMA is not set @@ -6060,7 +6050,6 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_MODULE_COMPRESS is not set # CONFIG_RTC_DRV_EFI is not set -# CONFIG_NET_XGENE is not set # CONFIG_GLOB_SELFTEST is not set |