diff --git a/[refs] b/[refs]
index 0fd59277c684..f0bcba7a4426 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de139a3393958c5adc75b7df7619d7e48d9ea559
+refs/heads/master: 1d9e882ba4971f31473dd812da64909f30a6c242
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 17e7d5048b83..9630fbdf4e6c 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -1420,7 +1420,7 @@ struct device *__root_device_register(const char *name, struct module *owner)
 		return ERR_PTR(err);
 	}
 
-#ifdef CONFIG_MODULE	/* gotta find a "cleaner" way to do this */
+#ifdef CONFIG_MODULES	/* gotta find a "cleaner" way to do this */
 	if (owner) {
 		struct module_kobject *mk = &owner->mkobj;