diff --git a/[refs] b/[refs] index cde1f484432d..6bcca27b62cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dab16ae1a9fc72a9f419f2dff91854e452d02a5e +refs/heads/master: e22c8f4616c8e68b7659331409e9c081ce265498 diff --git a/trunk/arch/h8300/Kconfig.cpu b/trunk/arch/h8300/Kconfig.cpu index d236ab4232ca..15c22286ae79 100644 --- a/trunk/arch/h8300/Kconfig.cpu +++ b/trunk/arch/h8300/Kconfig.cpu @@ -162,9 +162,7 @@ config H8300_TPU_CH int "TPU channel" depends on H8300_TPU -config PREEMPT - bool "Preemptible Kernel" - default n +source "kernel/Kconfig.preempt" source "mm/Kconfig"