diff --git a/[refs] b/[refs] index 2a27f40a06d5..63ae6efd62a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dc4e37362a5dc910d704d52ac6542bfd49ddc2f +refs/heads/master: 78f508ab07954d12896097ac07ab2fab443c7ca2 diff --git a/trunk/arch/m68knommu/Kconfig b/trunk/arch/m68knommu/Kconfig index 07eb4c4bab82..8e8441587c22 100644 --- a/trunk/arch/m68knommu/Kconfig +++ b/trunk/arch/m68knommu/Kconfig @@ -671,6 +671,9 @@ config ROMKERNEL endchoice +if COLDFIRE +source "kernel/Kconfig.preempt" +endif source "mm/Kconfig" endmenu