summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-22 23:50:56 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-30 02:12:01 +1100
commit6dde7fc0e5ef62c51fbc26364a7a6984d20ea289 (patch)
treefbc6d34c3d010b7e499b14f32b46c0fcfe1846b2 /drivers
parent498744370360abc7f01da8fd92d37750990d8b5f (diff)
driver core: fix root_device_register for not CONFIG_MODULES
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6fbdd8bb8a3d..aa939807047b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1273,6 +1273,7 @@ struct device *__root_device_register(const char *name, struct module *owner)
return ERR_PTR(err);
}
+#ifdef CONFIG_MODULE
if (owner) {
struct module_kobject *mk = &owner->mkobj;
@@ -1283,6 +1284,7 @@ struct device *__root_device_register(const char *name, struct module *owner)
}
root->owner = owner;
}
+#endif
return &root->dev;
}