[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 4aec747d9e43..9fe3a38883ee 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4919,7 +4919,10 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         pci_cmd &= ~PCI_COMMAND_SERR;
         pci_cmd |= PCI_COMMAND_PARITY;
         pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
-        pci_set_mwi(pdev);
+        if (pci_set_mwi(pdev))
+                printk(KERN_WARNING PFX "Could enable MWI for %s\n",
+                       pci_name(pdev));
+
         /*
          * On some architectures, the default cache line size set
          * by pci_set_mwi reduces perforamnce.  We have to increase