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

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of: change of_match_device to work with struct device
  of: Remove duplicate fields from of_platform_driver
  drivercore: Add of_match_table to the common device drivers
  arch/microblaze: Move dma_mask from of_device into pdev_archdata
  arch/powerpc: Move dma_mask from of_device into pdev_archdata
  of: eliminate of_device->node and dev_archdata->{of,prom}_node
  of: Always use 'struct device.of_node' to get device node pointer.
  i2c/of: Allow device node to be passed via i2c_board_info
  driver-core: Add device node pointer to struct device
  of: protect contents of of_platform.h and of_device.h
  of/flattree: Make unflatten_device_tree() safe to call from any arch
  of/flattree: make of_fdt.h safe to unconditionally include.

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 36dbcee1ac29..ba124baa646d 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -143,7 +143,7 @@ static int of_flash_remove(struct of_device *dev)
 static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
                                                   struct map_info *map)
 {
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
         const char *of_probe;
         struct mtd_info *mtd;
         static const char *rom_probe_types[]
@@ -221,7 +221,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 #ifdef CONFIG_MTD_PARTITIONS
         const char **part_probe_types;
 #endif
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
         struct resource res;
         struct of_flash *info;
         const char *probe_type = match->data;
@@ -245,7 +245,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
         p = of_get_property(dp, "reg", &count);
         if (count % reg_tuple_size != 0) {
                 dev_err(&dev->dev, "Malformed reg property on %s\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                 err = -EINVAL;
                 goto err_flash_remove;
         }
@@ -418,8 +418,11 @@ static struct of_device_id of_flash_match[] = {
 MODULE_DEVICE_TABLE(of, of_flash_match);
 
 static struct of_platform_driver of_flash_driver = {
-        .name           = "of-flash",
-        .match_table    = of_flash_match,
+        .driver = {
+                .name = "of-flash",
+                .owner = THIS_MODULE,
+                .of_match_table = of_flash_match,
+        },
         .probe          = of_flash_probe,
         .remove         = of_flash_remove,
 };