lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2008-01-31 09:31:37 +11:00
parent 2c57ee6f92 c847c853a5
commit 3b470ac43f
5 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/class.c
View File

@@ -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;