diff --git a/[refs] b/[refs] index 90368e0cbd48..146cdd39d49d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aea1181b0bd0a09c54546399768f359d1e198e45 +refs/heads/master: b2a1fa30b54ed616e0ae6f521bcd3fad750f5184 diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index 27060b20678e..7cb8adfb9e49 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/arch/sparc/Kconfig @@ -386,9 +386,7 @@ config SCHED_MC making when dealing with multi-core CPU chips at a cost of slightly increased overhead in some places. If unsure say N here. -if SPARC64 source "kernel/Kconfig.preempt" -endif config CMDLINE_BOOL bool "Default bootloader kernel arguments"