Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into samba4

[people/amarx/ipfire-3.x.git] / kernel / config-arm-generic

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 085f04b7a283bbb975b541882d169b80666a51ba..973441e435c99f855a2f05c2c61566cdf2d5ce38 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -9,27 +9,10 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 
-#
-# Timers subsystem
-#
-# CONFIG_NO_HZ_IDLE is not set
-CONFIG_NO_HZ_FULL=y
-# CONFIG_NO_HZ_FULL_ALL is not set
-# CONFIG_NO_HZ_FULL_SYSIDLE is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-
 #
 # RCU Subsystem
 #
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -102,11 +85,6 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_SCPI_CPUFREQ=m
 
-#
-# Classification
-#
-CONFIG_BPF_JIT=y
-
 #
 # Bluetooth device drivers
 #
@@ -327,7 +305,6 @@ CONFIG_GPIO_PL061=y
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
-CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_VEXPRESS=y
 
 #
@@ -397,7 +374,6 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_DVB_PT1 is not set
 # CONFIG_MANTIS_CORE is not set
 # CONFIG_DVB_NGENE is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
 
 #
 # DVB-S (satellite) frontends
@@ -681,6 +657,5 @@ CONFIG_CRYPTO_XTS=m
 #
 # Library routines
 #
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_LIBFDT=y