Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
  of/platform: Register of_platform_drivers with an "of:" prefix
  of/address: Clean up function declarations
  of/spi: call of_register_spi_devices() from spi core code
  of: Provide default of_node_to_nid() implementation.
  of/device: Make of_device_make_bus_id() usable by other code.
  of/irq: Fix endian issues in parsing interrupt specifiers
  of: Fix phandle endian issues
  of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
  of: remove of_default_bus_ids
  of: make of_find_device_by_node generic
  microblaze: remove references to of_device and to_of_device
  sparc: remove references to of_device and to_of_device
  powerpc: remove references to of_device and to_of_device
  of/device: Replace of_device with platform_device in includes and core code
  of/device: Protect against binding of_platform_drivers to non-OF devices
  of: remove asm/of_device.h
  of: remove asm/of_platform.h
  of/platform: remove all of_bus_type and of_platform_bus_type references
  of: Merge of_platform_bus_type with platform_bus_type
  drivercore/of: Add OF style matching to platform bus
  ...

Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
some obj-y removals by the devicetree branch, while the microblaze
updates added a new file.

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index b99c38f23d61..26af2dd5d831 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -2247,20 +2247,20 @@ static struct of_platform_driver n2_mau_driver = {
 
 static int __init n2_init(void)
 {
-        int err = of_register_driver(&n2_crypto_driver, &of_bus_type);
+        int err = of_register_platform_driver(&n2_crypto_driver);
 
         if (!err) {
-                err = of_register_driver(&n2_mau_driver, &of_bus_type);
+                err = of_register_platform_driver(&n2_mau_driver);
                 if (err)
-                        of_unregister_driver(&n2_crypto_driver);
+                        of_unregister_platform_driver(&n2_crypto_driver);
         }
         return err;
 }
 
 static void __exit n2_exit(void)
 {
-        of_unregister_driver(&n2_mau_driver);
-        of_unregister_driver(&n2_crypto_driver);
+        of_unregister_platform_driver(&n2_mau_driver);
+        of_unregister_platform_driver(&n2_crypto_driver);
 }
 
 module_init(n2_init);