Prev: [PATCH 28/38] sysfs: Remove usage of S_BIAS to avoid merge conflict with the vfs tree
Next: [PATCH 34/38] net/sysfs: Fix the bitrot in network device kobject namespace support
From: Greg Kroah-Hartman on 21 May 2010 13:00
From: Christoph Egger <siccegge(a)cs.fau.de>

In this code section the final S of CONFIG_MODULES was missed making
the whole check useless

Signed-off-by: Christoph Egger <siccegge(a)cs.fau.de>
Cc: Mark McLoughlin <markmc(a)redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
---
drivers/base/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 17e7d50..9630fbd 100644
--- a/drivers/base/core.c
+++ b/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;

--
1.7.0.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 28/38] sysfs: Remove usage of S_BIAS to avoid merge conflict with the vfs tree
Next: [PATCH 34/38] net/sysfs: Fix the bitrot in network device kobject namespace support