diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index f87e1fa..ab31da6 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -96,7 +96,7 @@
 
 	/*
 	 * Try to populate the mux adapter's device_node, expands to
-	 * nothing if !CONFIG_OF.
+	 * nothing if !CONFIG_OFDEVICE.
 	 */
 	if (mux_dev->device_node) {
 		struct device_node *child;
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 97f55ef..a7a444e 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -612,13 +612,13 @@
 		/* sentinel */
 	}
 };
-#else /* CONFIG_OF */
+#else /* CONFIG_OFDEVICE */
 static int usb251xb_get_ofdata(struct usb251xb *hub,
 			       struct usb251xb_data *data)
 {
 	return 0;
 }
-#endif /* CONFIG_OF */
+#endif /* CONFIG_OFDEVICE */
 
 static int usb251xb_probe(struct usb251xb *hub)
 {
diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
index 32ea46e..9e0fd42 100644
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -103,6 +103,6 @@
 {
 	return ERR_PTR(-ENOSYS);
 }
-#endif /* CONFIG_NVMEM && CONFIG_OF */
+#endif /* CONFIG_NVMEM && CONFIG_OFTREE */
 
 #endif  /* ifndef _LINUX_NVMEM_CONSUMER_H */
diff --git a/include/of_device.h b/include/of_device.h
index 44c1c0f..54410ad 100644
--- a/include/of_device.h
+++ b/include/of_device.h
@@ -22,7 +22,7 @@
 
 extern const void *of_device_get_match_data(const struct device_d *dev);
 
-#else /* CONFIG_OF */
+#else /* CONFIG_OFTREE */
 
 static inline int of_driver_match_device(struct device_d *dev,
 					 const struct device_d *drv)
@@ -43,6 +43,6 @@
 #define of_match_device(matches, dev)	\
 	__of_match_device(matches, (dev))
 
-#endif /* CONFIG_OF */
+#endif /* CONFIG_OFTREE */
 
 #endif /* _LINUX_OF_DEVICE_H */