Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (26 commits)
  [SPARC64]: Fix UP build.
  [SPARC64]: dr-cpu unconfigure support.
  [SERIAL]: Fix console write locking in sparc drivers.
  [SPARC64]: Give more accurate errors in dr_cpu_configure().
  [SPARC64]: Clear cpu_{core,sibling}_map[] in smp_fill_in_sib_core_maps()
  [SPARC64]: Fix leak when DR added cpu does not bootup.
  [SPARC64]: Add ->set_affinity IRQ handlers.
  [SPARC64]: Process dr-cpu events in a kthread instead of workqueue.
  [SPARC64]: More sensible udelay implementation.
  [SPARC64]: SMP build fixes.
  [SPARC64]: mdesc.c needs linux/mm.h
  [SPARC64]: Fix build regressions added by dr-cpu changes.
  [SPARC64]: Unconditionally register vio_bus_type.
  [SPARC64]: Initial LDOM cpu hotplug support.
  [SPARC64]: Fix setting of variables in LDOM guest.
  [SPARC64]: Fix MD property lifetime bugs.
  [SPARC64]: Abstract out mdesc accesses for better MD update handling.
  [SPARC64]: Use more mearningful names for IRQ registry.
  [SPARC64]: Initial domain-services driver.
  [SPARC64]: Export powerd facilities for external entities.
  ...

diff --combined drivers/block/Kconfig
index fd7a53bdcb6328b477189e726bb2c284823fc014,d9867fd2f2a5e2f62bcb2fe7c4cd93b504b3e9c3..e49162b15578f1e3b58378ac1c05dafc28543074
--- 1/drivers/block/Kconfig
--- 2/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@@ -113,7 -113,7 +113,7 @@@ source "drivers/block/paride/Kconfig
  
  config BLK_CPQ_DA
        tristate "Compaq SMART2 support"
 -      depends on PCI
 +      depends on PCI && VIRT_TO_BUS
        help
          This is the driver for Compaq Smart Array controllers.  Everyone
          using these boards should say Y here.  See the file
@@@ -423,6 -423,13 +423,13 @@@ config ATA_OVER_ET
        This driver provides Support for ATA over Ethernet block
        devices like the Coraid EtherDrive (R) Storage Blade.
  
+ config SUNVDC
+       tristate "Sun Virtual Disk Client support"
+       depends on SUN_LDOMS
+       help
+         Support for virtual disk devices as a client under Sun
+         Logical Domains.
+ 
  source "drivers/s390/block/Kconfig"
  
  endif # BLK_DEV