diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-22 20:42:10 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-22 20:42:10 -0800 |
| commit | a869fa7c41c7c866661d58902ca6fac15e1e1498 (patch) | |
| tree | c59ca21f3ebc17e251ac6c10414405dd659aaba4 | |
| parent | a3da3fafda55f888a7c2102bc6af374089adb243 (diff) | |
| download | patches-a869fa7c41c7c866661d58902ca6fac15e1e1498.tar.gz | |
fix build bug in driver-core/driver-core-add-root_device_register.patch
| -rw-r--r-- | driver-core/driver-core-add-root_device_register.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/driver-core/driver-core-add-root_device_register.patch b/driver-core/driver-core-add-root_device_register.patch index 4ec9333e70bcc3..22c4a3ed372f32 100644 --- a/driver-core/driver-core-add-root_device_register.patch +++ b/driver-core/driver-core-add-root_device_register.patch @@ -21,13 +21,13 @@ Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/base/core.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ - include/linux/device.h | 11 ++++++ - 2 files changed, 100 insertions(+) + drivers/base/core.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/device.h | 11 +++++ + 2 files changed, 102 insertions(+) --- a/drivers/base/core.c +++ b/drivers/base/core.c -@@ -1217,6 +1217,95 @@ EXPORT_SYMBOL_GPL(put_device); +@@ -1217,6 +1217,97 @@ EXPORT_SYMBOL_GPL(put_device); EXPORT_SYMBOL_GPL(device_create_file); EXPORT_SYMBOL_GPL(device_remove_file); @@ -87,6 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + return ERR_PTR(err); + } + ++#ifdef CONFIG_MODULE /* gotta find a "cleaner" way to do this */ + if (owner) { + struct module_kobject *mk = &owner->mkobj; + @@ -97,6 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + } + root->owner = owner; + } ++#endif + + return &root->dev; +} |