Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi

[mv-sheeva.git] / drivers / scsi / hpsa.h

diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 91edafb8c7e6a257b5c13d7ed7f082b95bb95685..7b28d54fa878efa075cfaefa6587ecce31bf880f 100644 (file)
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -58,7 +58,6 @@ struct ctlr_info {
        unsigned long paddr;
        int     nr_cmds; /* Number of commands allowed on this controller */
        struct CfgTable __iomem *cfgtable;
-       int     max_sg_entries;
        int     interrupts_enabled;
        int     major;
        int     max_commands;
@@ -317,7 +316,7 @@ static unsigned long SA5_completed(struct ctlr_info *h)
                dev_dbg(&h->pdev->dev, "Read %lx back from board\n",
                        register_value);
        else
-               dev_dbg(&h->pdev->dev, "hpsa: FIFO Empty read\n");
+               dev_dbg(&h->pdev->dev, "FIFO Empty read\n");
 #endif
 
        return register_value;