Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

diff --cc arch/arm/mach-pxa/corgi_ssp.c
Simple merge

diff --cc arch/um/drivers/net_kern.c
Simple merge

diff --cc arch/xtensa/platform-iss/network.c
Simple merge

diff --cc drivers/hwmon/hdaps.c
index c8c84e0819fbbc2e3a4e0cd55472933836a5e108,3bf05d5d0c82feab785e4c403481b083c8483c7d..c81bd4bce1b8648b69b7e730f5c2c414be5d85bf
--- 1/drivers/hwmon/hdaps.c
--- 2/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@@ -303,14 -301,27 +303,15 @@@ static int hdaps_resume(struct platform
        return hdaps_device_init();
  }
  
- static struct device_driver hdaps_driver = {
-       .name = "hdaps",
-       .bus = &platform_bus_type,
-       .owner = THIS_MODULE,
+ static struct platform_driver hdaps_driver = {
        .probe = hdaps_probe,
-       .resume = hdaps_resume
+       .resume = hdaps_resume,
+       .driver = {
+               .name = "hdaps",
+               .owner = THIS_MODULE,
+       },
  };
  
 -/* Input class stuff */
 -
 -static struct input_dev hdaps_idev = {
 -      .name = "hdaps",
 -      .evbit = { BIT(EV_ABS) },
 -      .absbit = { BIT(ABS_X) | BIT(ABS_Y) },
 -      .absmin  = { [ABS_X] = -256, [ABS_Y] = -256 },
 -      .absmax  = { [ABS_X] = 256, [ABS_Y] = 256 },
 -      .absfuzz = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
 -      .absflat = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
 -};
 -
  /*
   * hdaps_calibrate - Set our "resting" values.  Callers must hold hdaps_sem.
   */
@@@ -599,10 -595,10 +600,10 @@@ out
  static void __exit hdaps_exit(void)
  {
        del_timer_sync(&hdaps_timer);
 -      input_unregister_device(&hdaps_idev);
 +      input_unregister_device(hdaps_idev);
        sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
        platform_device_unregister(pdev);
-       driver_unregister(&hdaps_driver);
+       platform_driver_unregister(&hdaps_driver);
        release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS);
  
        printk(KERN_INFO "hdaps: driver unloaded.\n");

diff --cc drivers/misc/hdpuftrs/hdpu_cpustate.c
Simple merge

diff --cc drivers/misc/hdpuftrs/hdpu_nexus.c
Simple merge

diff --cc drivers/mmc/wbsd.c
index 6166ceb9571749110cb6bfe6e6721afdbbfef629,ea23a31fac90997762887a52bb499c1973d379bb..c7eb7c269081860303ce07f95369a29e0f30e2e3
--- 1/drivers/mmc/wbsd.c
--- 2/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@@ -2038,11 -2038,9 +2038,9 @@@ static int wbsd_resume(struct platform_
  
  static struct platform_device *wbsd_device;
  
- static struct device_driver wbsd_driver = {
-       .name           = DRIVER_NAME,
-       .bus            = &platform_bus_type,
+ static struct platform_driver wbsd_driver = {
        .probe          = wbsd_probe,
 -      .remove         = wbsd_remove,
 +      .remove         = __devexit_p(wbsd_remove),
  
        .suspend        = wbsd_suspend,
        .resume         = wbsd_resume,

diff --cc drivers/net/dm9000.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/usb/gadget/dummy_hcd.c
Simple merge

diff --cc drivers/usb/gadget/pxa2xx_udc.c
Simple merge

diff --cc drivers/video/backlight/corgi_bl.c
Simple merge