From 5a2930f23abf9a9dcb7ae5c409f3c747f51e2f41 Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@cs.fau.de>
Date: Mon, 17 May 2010 16:57:58 +0200
Subject: [PATCH] --- yaml --- r: 196063 b: refs/heads/master c:
 1d9e882ba4971f31473dd812da64909f30a6c242 h: refs/heads/master i:   196061:
 f4f324acfa115a1e36f1c8d587e36e265bcc2f5d   196059:
 cd1450e45c1bef74ed2b45d47bfb5056c813255c   196055:
 da3a50bf8be4c12b9a6effb51b41a8f44b740775   196047:
 59dba99381dcb26ea76f65b58084c71a2981f07a   196031:
 00463a6e48275c3d69e4b8168f70ccee5be342f5 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;