diff options
| author | Arve Hjønnevåg <arve@android.com> | 2010-08-05 16:25:22 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2010-08-05 16:25:22 -0700 |
| commit | bc48233fc5f0d95892a28f741ed94215864625e7 (patch) | |
| tree | 439a10e51f0e60fdf5a1213c5f6985f7c0a4cd4b /drivers/base | |
| parent | 1b0a8568dee3b4fde194f91214a4d177a963f2f8 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into android-2.6.35
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | 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 9630fbdf4e6..9b9d3bd54e3 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -673,7 +673,7 @@ static struct kobject *get_device_parent(struct device *dev, */ if (parent == NULL) parent_kobj = virtual_device_parent(dev); - else if (parent->class) + else if (parent->class && !dev->class->ns_type) return &parent->kobj; else parent_kobj = &parent->kobj; |