Merge branch 'master' into for-linus

Conflicts:
	fs/pipe.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

2 files changed, 7 insertions, 8 deletions

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 59ca2b77b574..52f2d11bc7b9 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1004,7 +1004,7 @@ static const struct block_device_operations floppy_fops = {
 
 static int swim3_add_device(struct macio_dev *mdev, int index)
 {
-        struct device_node *swim = mdev->ofdev.node;
+        struct device_node *swim = mdev->ofdev.dev.of_node;
         struct floppy_state *fs = &floppy_states[index];
         int rc = -EBUSY;
 
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index e1c95e208a66..a7b83c0a7eb5 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1198,10 +1198,10 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match)
         dev_dbg(&op->dev, "ace_of_probe(%p, %p)\n", op, match);
 
         /* device id */
-        id = of_get_property(op->node, "port-number", NULL);
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
 
         /* physaddr */
-        rc = of_address_to_resource(op->node, 0, &res);
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
         if (rc) {
                 dev_err(&op->dev, "invalid address\n");
                 return rc;
@@ -1209,11 +1209,11 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match)
         physaddr = res.start;
 
         /* irq */
-        irq = irq_of_parse_and_map(op->node, 0);
+        irq = irq_of_parse_and_map(op->dev.of_node, 0);
 
         /* bus width */
         bus_width = ACE_BUS_WIDTH_16;
-        if (of_find_property(op->node, "8-bit", NULL))
+        if (of_find_property(op->dev.of_node, "8-bit", NULL))
                 bus_width = ACE_BUS_WIDTH_8;
 
         /* Call the bus-independant setup code */
@@ -1237,13 +1237,12 @@ static const struct of_device_id ace_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, ace_of_match);
 
 static struct of_platform_driver ace_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "xsysace",
-        .match_table = ace_of_match,
         .probe = ace_of_probe,
         .remove = __devexit_p(ace_of_remove),
         .driver = {
                 .name = "xsysace",
+                .owner = THIS_MODULE,
+                .of_match_table = ace_of_match,
         },
 };