diff --git a/[refs] b/[refs] index 9a5610d5f32a..2524cdac2e78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bd75c77b7c6a3954140dd2e20346aef3efe4a35 +refs/heads/master: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index a05f843e7e52..ccb9f8f87f40 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -332,7 +332,7 @@ config VIRT_CPU_ACCOUNTING choice prompt "Cputime accounting" default TICK_CPU_ACCOUNTING if !PPC64 - default VIRT_CPU_ACCOUNTING if PPC64 + default VIRT_CPU_ACCOUNTING_NATIVE if PPC64 # Kind of a stub config for the pure tick based cputime accounting config TICK_CPU_ACCOUNTING