Merge branch 'master'

diff --combined drivers/scsi/Makefile
index 503f189,81803a1..669ff6b
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -78,7 -78,6 +78,6 @@@ obj-$(CONFIG_SCSI_NCR_Q720)   += NCR_Q720
  obj-$(CONFIG_SCSI_SYM53C416)  += sym53c416.o
  obj-$(CONFIG_SCSI_QLOGIC_FAS) += qlogicfas408.o       qlogicfas.o
  obj-$(CONFIG_PCMCIA_QLOGIC)   += qlogicfas408.o
- obj-$(CONFIG_SCSI_QLOGIC_FC)  += qlogicfc.o 
  obj-$(CONFIG_SCSI_QLOGIC_1280)        += qla1280.o 
  obj-$(CONFIG_SCSI_QLA_FC)     += qla2xxx/
  obj-$(CONFIG_SCSI_LPFC)               += lpfc/
@@@ -165,7 -164,7 +164,7 @@@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) 
  CFLAGS_ncr53c8xx.o    := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
  zalon7xx-objs := zalon.o ncr53c8xx.o
  NCR_Q720_mod-objs     := NCR_Q720.o ncr53c8xx.o
 -libata-objs   := libata-core.o libata-scsi.o libata-bmdma.o
 +libata-objs   := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
  oktagon_esp_mod-objs  := oktagon_esp.o oktagon_io.o
  
  # Files generated that shall be removed upon make clean

diff --combined drivers/scsi/sata_mv.c
index 4aabc75,d5fdcb9..181917a
--- 1/drivers/scsi/sata_mv.c
--- 2/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -747,7 -747,7 +747,7 @@@ static void mv_dump_all_regs(void __iom
        mv_dump_mem(mmio_base+0xf00, 0x4);
        mv_dump_mem(mmio_base+0x1d00, 0x6c);
        for (hc = start_hc; hc < start_hc + num_hcs; hc++) {
-               hc_base = mv_hc_base(mmio_base, port >> MV_PORT_HC_SHIFT);
+               hc_base = mv_hc_base(mmio_base, hc);
                DPRINTK("HC regs (HC %i):\n", hc);
                mv_dump_mem(hc_base, 0x1c);
        }
@@@ -1396,7 -1396,7 +1396,7 @@@ static void mv_host_intr(struct ata_hos
                        }
                }
  
 -              if (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))
 +              if (ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))
                        continue;
  
                err_mask = ac_err_mask(ata_status);
@@@ -1990,7 -1990,7 +1990,7 @@@ comreset_retry
        tf.nsect = readb((void __iomem *) ap->ioaddr.nsect_addr);
  
        dev->class = ata_dev_classify(&tf);
 -      if (!ata_dev_present(dev)) {
 +      if (!ata_dev_enabled(dev)) {
                VPRINTK("Port disabled post-sig: No device present.\n");
                ata_port_disable(ap);
        }