diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-05 07:27:27 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-05 07:27:27 +0200 |
commit | 3e2f739b3948ca7eb17a3bf31037e45c5115745b (patch) | |
tree | e36c2c0278b84df787ea06b1002a4817afc2cf28 /kernel-s390x.config | |
parent | 36edc21cd012a2a2818072513c559b14cd87dfb1 (diff) | |
parent | af8a9aac1beeafc5103fd8e371c3c4f3d4dbced6 (diff) | |
download | kernel-3e2f739b3948ca7eb17a3bf31037e45c5115745b.tar.gz kernel-3e2f739b3948ca7eb17a3bf31037e45c5115745b.tar.xz kernel-3e2f739b3948ca7eb17a3bf31037e45c5115745b.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc5.git1.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc5.git1.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc5.git1.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc5.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 176b160ed..c3ebd0184 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -169,7 +169,6 @@ CONFIG_APPLDATA_OS=m # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -# CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_AS3935 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -323,7 +322,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1023,18 +1021,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1062,8 +1051,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1242,7 +1229,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1258,19 +1244,12 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1313,9 +1292,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -1672,7 +1648,6 @@ CONFIG_I2C_DIOLAN_U2C=m # CONFIG_I2C_HELPER_AUTO is not set # CONFIG_I2C_HID is not set # CONFIG_I2C_I801 is not set -CONFIG_I2C_IMX_LPI2C=m # CONFIG_I2C_ISCH is not set CONFIG_I2C=m CONFIG_I2C_MLXCPLD=m @@ -1716,8 +1691,6 @@ CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_PARTITION=y CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set @@ -1887,7 +1860,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -2526,7 +2498,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_GXL_PHY=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -2592,7 +2563,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4545,7 +4515,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4646,10 +4615,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4658,7 +4623,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m # CONFIG_SUSPEND is not set @@ -4739,7 +4703,6 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -CONFIG_TEGRA_IVC=y CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m @@ -5406,8 +5369,6 @@ CONFIG_VLSI_FIR=m CONFIG_VMCP=y # CONFIG_VME_BUS is not set CONFIG_VMLOGRDR=m -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m |