summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-06-15 12:57:54 +0100
committerPeter Robinson <pbrobinson@gmail.com>2018-06-15 12:57:54 +0100
commitc36cd75159e9c50ca034029d0e33f83adcc366c8 (patch)
treea068919e41ce83331a526505683f2e14e0807ea1 /kernel-x86_64.config
parent861ae54010f0dae5c988105b6179a8f2442851e7 (diff)
downloadkernel-c36cd75159e9c50ca034029d0e33f83adcc366c8.tar.gz
kernel-c36cd75159e9c50ca034029d0e33f83adcc366c8.tar.xz
kernel-c36cd75159e9c50ca034029d0e33f83adcc366c8.zip
ARM updates for 4.18, cleanup some dropped config options
Diffstat (limited to 'kernel-x86_64.config')
-rw-r--r--kernel-x86_64.config28
1 files changed, 4 insertions, 24 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 0427ab72d..a7faf83ba 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -254,7 +254,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCH_W90X900 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARM_CCI_PMU is not set
# CONFIG_AS3935 is not set
# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
@@ -1035,7 +1034,6 @@ CONFIG_CRYPTO_SHA512_SSSE3=m
CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SKEIN is not set
CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
CONFIG_CRYPTO_SM4=m
CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=m
@@ -1265,10 +1263,6 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
-# CONFIG_DRM_EXYNOS_FIMC is not set
-# CONFIG_DRM_EXYNOS_GSC is not set
-# CONFIG_DRM_EXYNOS_ROTATOR is not set
-# CONFIG_DRM_EXYNOS_SCALER is not set
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
CONFIG_DRM_GMA3600=y
@@ -1339,7 +1333,6 @@ CONFIG_DRM_SII9234=m
CONFIG_DRM_TI_TFP410=m
# CONFIG_DRM_TOSHIBA_TC358767 is not set
CONFIG_DRM_UDL=m
-# CONFIG_DRM_V3D is not set
CONFIG_DRM_VBOXVIDEO=m
CONFIG_DRM_VGEM=m
CONFIG_DRM_VIA=m
@@ -1672,7 +1665,7 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_FIXED_PHY=y
+CONFIG_FIXED_PHY=m
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m
@@ -2155,7 +2148,6 @@ CONFIG_IB700_WDT=m
CONFIG_IBM_ASM=m
CONFIG_IBMASR=m
# CONFIG_IBM_RTL is not set
-# CONFIG_IBMVMC is not set
CONFIG_ICE=m
CONFIG_ICPLUS_PHY=m
# CONFIG_ICS932S401 is not set
@@ -2195,7 +2187,7 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_KFIFO_BUF=m
CONFIG_IIO=m
CONFIG_IIO_MUX=m
-# CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE=m
# CONFIG_IIO_SIMPLE_DUMMY is not set
# CONFIG_IIO_SSP_SENSORHUB is not set
CONFIG_IIO_ST_ACCEL_3AXIS=m
@@ -2357,7 +2349,6 @@ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY=y
-# CONFIG_INTEL_ATOMISP is not set
CONFIG_INTEL_BXT_PMIC_THERMAL=m
CONFIG_INTEL_CHTDC_TI_PWRBTN=m
CONFIG_INTEL_CHT_INT33FE=m
@@ -2458,7 +2449,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_HANDLER=m
# CONFIG_IPMI_PANIC_EVENT is not set
CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMI_PROC_INTERFACE is not set
CONFIG_IPMI_SI=m
CONFIG_IPMI_SSIF=m
CONFIG_IPMI_WATCHDOG=m
@@ -2569,7 +2559,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
CONFIG_IPW2200_QOS=y
CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPWIRELESS=m
-# CONFIG_IPX is not set
# CONFIG_IRDA is not set
CONFIG_IR_ENE=m
CONFIG_IR_FINTEK=m
@@ -2977,7 +2966,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2632 is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
CONFIG_LV0104CS=m
CONFIG_LWTUNNEL_BPF=y
CONFIG_LWTUNNEL=y
@@ -3058,6 +3046,7 @@ CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# CONFIG_MDIO_BUS_MUX is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_DEVICE=m
# CONFIG_MDIO_GPIO is not set
# CONFIG_MDIO_HISI_FEMAC is not set
CONFIG_MDIO_I2C=m
@@ -3465,7 +3454,6 @@ CONFIG_NATIONAL_PHY=m
CONFIG_NATSEMI=m
# CONFIG_NAU7802 is not set
# CONFIG_NBPFAXI_DMA is not set
-# CONFIG_NCP_FS is not set
CONFIG_ND_BLK=m
CONFIG_ND_BTT=m
CONFIG_ND_PFN=m
@@ -4152,15 +4140,12 @@ CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIEASPM=y
CONFIG_PCIE_CADENCE_HOST=y
CONFIG_PCIE_DPC=y
-# CONFIG_PCIE_DW_HOST_ECAM is not set
# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
# CONFIG_PCI_ENDPOINT is not set
# CONFIG_PCI_ENDPOINT_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_ROCKCHIP_HOST is not set
# CONFIG_PCI_FTPCI100 is not set
# CONFIG_PCI_GOOLPC is not set
CONFIG_PCI_HERMES=m
@@ -4212,7 +4197,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
# CONFIG_PHONE is not set
# CONFIG_PHONET is not set
# CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=y
+CONFIG_PHYLIB=m
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
@@ -4371,10 +4356,7 @@ CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_APR is not set
-# CONFIG_QCOM_COMMAND_DB is not set
# CONFIG_QCOM_EMAC is not set
-# CONFIG_QCOM_GENI_SE is not set
# CONFIG_QCOM_GLINK_SSR is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
@@ -5637,7 +5619,6 @@ CONFIG_STRIP_ASM_SYMS=y
CONFIG_ST_UVIS25_I2C=m
CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
-# CONFIG_SUN50I_H6_R_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -6021,7 +6002,6 @@ CONFIG_USB_DSBR=m
# CONFIG_USB_DWC3_HOST is not set
# CONFIG_USB_DWC3 is not set
# CONFIG_USB_DWC3_OF_SIMPLE is not set
-# CONFIG_USB_DWC3_QCOM is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_EHCI_HCD=y