diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-01 08:46:18 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-01 08:46:18 +0100 |
commit | 1126dddbf48bbd892d5c63675058328cf92fa94f (patch) | |
tree | 95ac36134d33267d42b00ae75bcd890ac70965bb /kernel-aarch64.config | |
parent | 51001d2d90f0b5218fefe329651d06f66e1c610e (diff) | |
parent | 1652b3b29eb207a6455cf6389a0b92b41ecb5e04 (diff) | |
download | kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26.tar.gz kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26.tar.xz kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26.zip |
merge masterkernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-aarch64.config')
-rw-r--r-- | kernel-aarch64.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 98f2b883c..61be13ca2 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -774,6 +774,7 @@ CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set CONFIG_CGROUP_SCHED=y CONFIG_CGROUPS=y # CONFIG_CHARGER_BQ2415X is not set @@ -4380,7 +4381,7 @@ CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_SUN6I=m +# CONFIG_RTC_DRV_SUN6I is not set CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m |