aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-09-24 14:36:49 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 10:16:44 -0700
commitead454feb6cbfe0fa6a1eeb30aa9abc338dacf62 (patch)
treecb3ffe169218a0d923f4e7d642850e74874f7f76 /drivers/base
parent7a868088ee48d1816c10f9be6d32aef4cf30bcf7 (diff)
downloadkernel_samsung_smdk4412-ead454feb6cbfe0fa6a1eeb30aa9abc338dacf62.zip
kernel_samsung_smdk4412-ead454feb6cbfe0fa6a1eeb30aa9abc338dacf62.tar.gz
kernel_samsung_smdk4412-ead454feb6cbfe0fa6a1eeb30aa9abc338dacf62.tar.bz2
driver core: fix build for CONFIG_BLOCK not enabled
Fix build errors when CONFIG_BLOCK is not enabled: drivers/base/core.c: In function 'get_device_parent': drivers/base/core.c:634: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks': drivers/base/core.c:723: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks': drivers/base/core.c:751: error: 'block_class' undeclared (first use in this function) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index f7f906f..2cb49a9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -630,12 +630,14 @@ static struct kobject *get_device_parent(struct device *dev,
struct kobject *parent_kobj;
struct kobject *k;
+#ifdef CONFIG_BLOCK
/* block disks show up in /sys/block */
if (sysfs_deprecated && dev->class == &block_class) {
if (parent && parent->class == &block_class)
return &parent->kobj;
return &block_class.p->class_subsys.kobj;
}
+#endif
/*
* If we have no parent, we live in "virtual".
@@ -719,9 +721,11 @@ static int device_add_class_symlinks(struct device *dev)
goto out_subsys;
}
+#ifdef CONFIG_BLOCK
/* /sys/block has directories and does not need symlinks */
if (sysfs_deprecated && dev->class == &block_class)
return 0;
+#endif
/* link in the class directory pointing to the device */
error = sysfs_create_link(&dev->class->p->class_subsys.kobj,
@@ -748,8 +752,10 @@ static void device_remove_class_symlinks(struct device *dev)
if (dev->parent && device_is_not_partition(dev))
sysfs_remove_link(&dev->kobj, "device");
sysfs_remove_link(&dev->kobj, "subsystem");
+#ifdef CONFIG_BLOCK
if (sysfs_deprecated && dev->class == &block_class)
return;
+#endif
sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
}