X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=init%2FKconfig;h=7f75a61eb52edade562b762f913c637e46dd087c;hb=b069122256e45216b5c49d9441f9713991a4c645;hp=c7900e8975f181857840d861e1cddd4e8201ecc4;hpb=198c414ef21a0b3521490430cade6aa7863a249e;p=linux-2.6-microblaze.git

diff --git a/init/Kconfig b/init/Kconfig
index c7900e8975f1..7f75a61eb52e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -494,11 +494,11 @@ config VIRT_CPU_ACCOUNTING_NATIVE
 
 config VIRT_CPU_ACCOUNTING_GEN
 	bool "Full dynticks CPU time accounting"
-	depends on HAVE_CONTEXT_TRACKING
+	depends on HAVE_CONTEXT_TRACKING_USER
 	depends on HAVE_VIRT_CPU_ACCOUNTING_GEN
 	depends on GENERIC_CLOCKEVENTS
 	select VIRT_CPU_ACCOUNTING
-	select CONTEXT_TRACKING
+	select CONTEXT_TRACKING_USER
 	help
 	  Select this option to enable task and CPU time accounting on full
 	  dynticks systems. This accounting is implemented by watching every
@@ -1481,6 +1481,7 @@ config HAVE_PCSPKR_PLATFORM
 # interpreter that classic socket filters depend on
 config BPF
 	bool
+	select CRYPTO_LIB_SHA1
 
 menuconfig EXPERT
 	bool "Configure standard kernel features (expert users)"