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

diff --combined drivers/base/class.c
index 412fd9a05573e742117fced63ed4210512fbe79d,d916bbf5b72a7b47169f47e81a069abcea87a19a..9d915376c313d1049e9dc0c8cdd65d2c788db3bd
--- 1/drivers/base/class.c
--- 2/drivers/base/class.c
+++ b/drivers/base/class.c
@@@ -149,7 -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;
@@@ -863,7 -863,7 +863,7 @@@ EXPORT_SYMBOL_GPL(class_for_each_device
   * The callback should return 0 if the device doesn't match and non-zero
   * if it does.  If the callback returns non-zero, this function will
   * return to the caller and not iterate over any more devices.
 -
 + *
   * Note, you will need to drop the reference with put_device() after use.
   *
   * We hold class->sem in this function, so it can not be