diff --git a/[refs] b/[refs]
index a88294525e7a..958107a035dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a531b0243cf78f1a5dd8f31762c1c493a800311
+refs/heads/master: 883d588e556347c4b3221ac492a8acd8a75e730a
diff --git a/trunk/include/linux/devfreq.h b/trunk/include/linux/devfreq.h
index 235248cb2c93..e83ef39b3bea 100644
--- a/trunk/include/linux/devfreq.h
+++ b/trunk/include/linux/devfreq.h
@@ -192,7 +192,7 @@ extern int devfreq_register_opp_notifier(struct device *dev,
 extern int devfreq_unregister_opp_notifier(struct device *dev,
 					   struct devfreq *devfreq);
 
-#ifdef CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND
+#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
 /**
  * struct devfreq_simple_ondemand_data - void *data fed to struct devfreq
  *	and devfreq_add_device