diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 23:31:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 23:31:37 +0100 |
| commit | 3b470ac43fcd9848fa65e58e54875ad75be61cec (patch) | |
| tree | eb067e163380d8a9e77a6df44f69dd4b935dd060 /drivers/base/class.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi... (diff) | |
| parent | PPC: Fix powerpc vio_find_name to not use devices_subsys (diff) | |
| download | linux-3b470ac43fcd9848fa65e58e54875ad75be61cec.tar.xz linux-3b470ac43fcd9848fa65e58e54875ad75be61cec.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
PPC: Fix powerpc vio_find_name to not use devices_subsys
Driver core: add bus_find_device_by_name function
Module: check to see if we have a built in module with the same name
x86: fix runtime error in arch/x86/kernel/cpu/mcheck/mce_amd_64.c
Driver core: Fix up build when CONFIG_BLOCK=N
Diffstat (limited to 'drivers/base/class.c')
| -rw-r--r-- | drivers/base/class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index 412fd9a05573..9d915376c313 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -149,7 +149,7 @@ int class_register(struct class *cls) if (error) return error; -#ifdef CONFIG_SYSFS_DEPRECATED +#if defined(CONFIG_SYSFS_DEPRECATED) && defined(CONFIG_BLOCK) /* let the block class directory show up in the root of sysfs */ if (cls != &block_class) cls->subsys.kobj.kset = class_kset; |