2 files changed, 10 insertions, 9 deletions

diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index c08ddac3717d..6ebf38213f9f 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -65,9 +65,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_request.h>
 #include <scsi/sg.h>
-#include <scsi/sg_request.h>
 
 #define OSM_NAME        "scsi-osm"
 #define OSM_VERSION     "1.316"
@@ -588,6 +586,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
 
         mptr = &msg->body[0];
 
+#if 0 /* this code can't work */
 #ifdef CONFIG_I2O_EXT_ADAPTEC
         if (c->adaptec) {
                 u32 adpt_flags = 0;
@@ -625,6 +624,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
                 *mptr++ = cpu_to_le32(adpt_flags | tid);
         }
 #endif
+#endif
 
         msg->u.head[1] = cpu_to_le32(cmd | HOST_TID << 12 | tid);
         msg->u.s.icntxt = cpu_to_le32(i2o_scsi_driver.context);
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index febbdd4e0605..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);
                 }
         }
 
@@ -1239,7 +1241,6 @@ EXPORT_SYMBOL(i2o_cntxt_list_remove);
 EXPORT_SYMBOL(i2o_cntxt_list_get_ptr);
 #endif
 EXPORT_SYMBOL(i2o_msg_get_wait);
-EXPORT_SYMBOL(i2o_msg_nop);
 EXPORT_SYMBOL(i2o_find_iop);
 EXPORT_SYMBOL(i2o_iop_find_device);
 EXPORT_SYMBOL(i2o_event_register);