diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-09 07:47:33 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-09 07:47:33 +0100 |
commit | fcea6100f4f3ee958360e2fedcbb79586df7a051 (patch) | |
tree | 01d293150ff91e9beb3088f360f849c5935b4cbe /kernel-aarch64.config | |
parent | e676ec22ee15ea1cdb0a1ad1f6a859e12e5b3a93 (diff) | |
parent | f8bdcf89c2e51095ac60ec50e0fa9bdf5b605a20 (diff) | |
download | kernel-fcea6100f4f3ee958360e2fedcbb79586df7a051.tar.gz kernel-fcea6100f4f3ee958360e2fedcbb79586df7a051.tar.xz kernel-fcea6100f4f3ee958360e2fedcbb79586df7a051.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc0.git8.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-aarch64.config')
-rw-r--r-- | kernel-aarch64.config | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 495108ff7..b76155b4c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1704,6 +1704,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y +# CONFIG_FTWDT010_WATCHDOG is not set # CONFIG_FUJITSU_ES is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y @@ -2471,7 +2472,6 @@ CONFIG_IPVTAP=m # CONFIG_IPW2200_DEBUG is not set # CONFIG_IPW2200 is not set CONFIG_IPWIRELESS=m -# CONFIG_IPX_INTERN is not set # CONFIG_IPX is not set # CONFIG_IRDA is not set CONFIG_IR_ENE=m @@ -3363,15 +3363,7 @@ CONFIG_NATIONAL_PHY=m CONFIG_NATSEMI=m # CONFIG_NAU7802 is not set # CONFIG_NBPFAXI_DMA is not set -CONFIG_NCPFS_EXTRAS=y -CONFIG_NCPFS_IOCTL_LOCKING=y # CONFIG_NCP_FS is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_STRONG=y CONFIG_ND_BLK=m CONFIG_ND_BTT=m CONFIG_NE2K_PCI=m @@ -5479,7 +5471,6 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -# CONFIG_SNI_AVE is not set CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set |