Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index c74f13bc9876..b5b48e703cb7 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -720,6 +720,8 @@ static int pata_macio_port_start(struct ata_port *ap)
         if (priv->dma_table_cpu == NULL) {
                 dev_err(priv->dev, "Unable to allocate DMA command list\n");
                 ap->ioaddr.bmdma_addr = NULL;
+                ap->mwdma_mask = 0;
+                ap->udma_mask = 0;
         }
         return 0;
 }
@@ -917,7 +919,7 @@ static struct scsi_host_template pata_macio_sht = {
 };
 
 static struct ata_port_operations pata_macio_ops = {
-        .inherits               = &ata_sff_port_ops,
+        .inherits               = &ata_bmdma_port_ops,
 
         .freeze                 = pata_macio_freeze,
         .set_piomode            = pata_macio_set_timings,
@@ -925,7 +927,6 @@ static struct ata_port_operations pata_macio_ops = {
         .cable_detect           = pata_macio_cable_detect,
         .sff_dev_select         = pata_macio_dev_select,
         .qc_prep                = pata_macio_qc_prep,
-        .mode_filter            = ata_bmdma_mode_filter,
         .bmdma_setup            = pata_macio_bmdma_setup,
         .bmdma_start            = pata_macio_bmdma_start,
         .bmdma_stop             = pata_macio_bmdma_stop,