6 files changed, 11 insertions, 13 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 12dd8d493ee2..57543603d6c8 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -46,7 +46,6 @@
 */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -1706,7 +1705,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                                 printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n",
                                         ioc->name);
                         rc = request_irq(ioc->pcidev->irq, mpt_interrupt,
-                                        SA_SHIRQ, ioc->name, ioc);
+                                        IRQF_SHARED, ioc->name, ioc);
                         if (rc < 0) {
                                 printk(MYIOC_s_ERR_FMT "Unable to allocate "
                                         "interrupt %d!\n", ioc->name,
@@ -5592,7 +5591,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
 
         /* The SCSI driver needs to adjust timeouts on all current
          * commands prior to the diagnostic reset being issued.
-         * Prevents timeouts occuring during a diagnostic reset...very bad.
+         * Prevents timeouts occurring during a diagnostic reset...very bad.
          * For all other protocol drivers, this is a no-op.
          */
         {
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 4720f9ae86aa..32ae4d664545 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -49,7 +49,6 @@
 #define MPTBASE_H_INCLUDED
 /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 
diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c
index 5a6cca8e8c45..8abe45e49ad7 100644
--- a/drivers/message/i2o/debug.c
+++ b/drivers/message/i2o/debug.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 7d4c5497785b..1ddc2fb429d5 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1089,7 +1089,6 @@ static int i2o_block_probe(struct device *dev)
         gd = i2o_blk_dev->gd;
         gd->first_minor = unit << 4;
         sprintf(gd->disk_name, "i2o/hd%c", 'a' + unit);
-        sprintf(gd->devfs_name, "i2o/hd%c", 'a' + unit);
         gd->driverfs_dev = &i2o_dev->device;
 
         /* setup request queue */
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index c74e5460f834..3305c12372a2 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -683,9 +683,10 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
                         c->mem_alloc = 1;
                         sb->current_mem_size = 1 + res->end - res->start;
                         sb->current_mem_base = res->start;
-                        osm_info("%s: allocated %ld bytes of PCI memory at "
-                                 "0x%08lX.\n", c->name,
-                                 1 + res->end - res->start, res->start);
+                        osm_info("%s: allocated %llu bytes of PCI memory at "
+                                "0x%016llX.\n", c->name,
+                                (unsigned long long)(1 + res->end - res->start),
+                                (unsigned long long)res->start);
                 }
         }
 
@@ -704,9 +705,10 @@ static int i2o_iop_systab_set(struct i2o_controller *c)
                         c->io_alloc = 1;
                         sb->current_io_size = 1 + res->end - res->start;
                         sb->current_mem_base = res->start;
-                        osm_info("%s: allocated %ld bytes of PCI I/O at 0x%08lX"
-                                 ".\n", c->name, 1 + res->end - res->start,
-                                 res->start);
+                        osm_info("%s: allocated %llu bytes of PCI I/O at "
+                                "0x%016llX.\n", c->name,
+                                (unsigned long long)(1 + res->end - res->start),
+                                (unsigned long long)res->start);
                 }
         }
 
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 4f1515cae5dc..1b58444d5aaf 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -274,7 +274,7 @@ static int i2o_pci_irq_enable(struct i2o_controller *c)
         writel(0xffffffff, c->irq_mask);
 
         if (pdev->irq) {
-                rc = request_irq(pdev->irq, i2o_pci_interrupt, SA_SHIRQ,
+                rc = request_irq(pdev->irq, i2o_pci_interrupt, IRQF_SHARED,
                                  c->name, c);
                 if (rc < 0) {
                         printk(KERN_ERR "%s: unable to allocate interrupt %d."