diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-03 18:46:11 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-03 18:46:11 +0100 |
commit | 5e4bf8336d19ba9d2a15697e806b2bac773e3378 (patch) | |
tree | 976c97d816ae545a61145f1b60e22d9479932693 /kernel-ppc64le-debug.config | |
parent | 89a5fb9b81444cc454701bef82d39ccf79a4f2b6 (diff) | |
parent | dd000cd2fd91c63e5b4d660ec4f44666a1779716 (diff) | |
download | kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc30.tar.gz kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc30.tar.xz kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc30.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc29kernel-4.21.0-0.rc0.git6.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-ppc64le-debug.config')
-rw-r--r-- | kernel-ppc64le-debug.config | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 3b4236680..154094529 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -638,7 +638,6 @@ CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set CONFIG_CAPI_AVM=y -CONFIG_CAPI_EICON=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1540,7 +1539,8 @@ CONFIG_FSI=m CONFIG_FSI_MASTER_GPIO=m CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_NEW_DEV_NODE is not set -# CONFIG_FSI_SBEFIFO is not set +CONFIG_FSI_OCC=m +CONFIG_FSI_SBEFIFO=m CONFIG_FSI_SCOM=m # CONFIG_FSL_DMA is not set # CONFIG_FSL_EDMA is not set @@ -2043,8 +2043,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_GPCV2_PM_DOMAINS is not set -# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2158,6 +2156,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y +# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set @@ -2370,12 +2369,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m # CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set CONFIG_ISDN_CAPI=m CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_MAINT=m -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_USERIDI=m CONFIG_ISDN_DIVERSION=m CONFIG_ISDN_DRV_AVMB1_AVM_CS=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m @@ -2820,7 +2813,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER_DVB is not set -# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_PCI_SUPPORT=y @@ -2857,7 +2850,6 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set -# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -3919,6 +3911,7 @@ CONFIG_PHYLIB=y CONFIG_PHYLINK=m # CONFIG_PHY_MAPPHONE_MDM6600 is not set # CONFIG_PHY_MVEBU_CP110_COMPHY is not set +# CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_USB_HSIC is not set @@ -3948,7 +3941,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m -# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4365,7 +4357,6 @@ CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_GENERIC=y # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set -# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -4746,6 +4737,7 @@ CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_OCC_P8_I2C=m +CONFIG_SENSORS_OCC_P9_SBE=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -5419,7 +5411,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set -# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -5547,6 +5538,7 @@ CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m +# CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set CONFIG_TOUCHSCREEN_RM_TS=m # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_S6SY761 is not set @@ -6025,7 +6017,7 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -# CONFIG_VFIO_PCI_NVLINK2 is not set +CONFIG_VFIO_PCI_NVLINK2=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set |