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

[safe/jmp/linux-2.6] / drivers / ata / sata_uli.c

diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index e5bff47..d8dac17 100644 (file)
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -26,6 +26,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
@@ -180,9 +181,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (rc)
                return rc;
 
-       rc = ata_pci_bmdma_init(host);
-       if (rc)
-               return rc;
+       ata_pci_bmdma_init(host);
 
        iomap = host->iomap;