merge

diff --cc drivers/usb/storage/scsiglue.c
index b04ad6a13ad370723c60ce55a4d7999a572eacb0,6ddc918a3733673ef7862381aa56eaf92910a64b..cd64dc35b258ebe978d0a74e713df082df3003f8
--- 1/drivers/usb/storage/scsiglue.c
--- 2/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@@ -364,16 -289,25 +289,16 @@@ struct scsi_host_template usb_stor_host
        /* basic userland interface stuff */
        .name =                         "usb-storage",
        .proc_name =                    "usb-storage",
-       .proc_info =                    usb_storage_proc_info,
-       .info =                         usb_storage_info,
+       .proc_info =                    proc_info,
 -      .proc_dir =                     NULL,
+       .info =                         host_info,
 -      .ioctl =                        NULL,
 -
 -      /* old-style detect and release */
 -      .detect =                       NULL,
 -      .release =                      NULL,
  
        /* command interface -- queued only */
-       .queuecommand =                 usb_storage_queuecommand,
 -      .command =                      NULL,
+       .queuecommand =                 queuecommand,
  
        /* error and abort handlers */
-       .eh_abort_handler =             usb_storage_command_abort,
-       .eh_device_reset_handler =      usb_storage_device_reset,
-       .eh_bus_reset_handler =         usb_storage_bus_reset,
+       .eh_abort_handler =             command_abort,
+       .eh_device_reset_handler =      device_reset,
+       .eh_bus_reset_handler =         bus_reset,
 -      .eh_host_reset_handler =        NULL,
 -      .eh_strategy_handler =          NULL,
  
        /* queue commands only, only one command per LUN */
        .can_queue =                    1,
@@@ -382,6 -316,14 +307,8 @@@
        /* unknown initiator id */
        .this_id =                      -1,
  
 -      /* no limit on commands */
 -      .max_sectors =                  0,
 -      
 -      /* pre- and post- device scan functions */
 -      .slave_alloc =                  NULL,
+       .slave_configure =              slave_configure,
 -      .slave_destroy =                NULL,
+ 
        /* lots of sg segments can be handled */
        .sg_tablesize =                 SG_ALL,
  

diff --cc drivers/usb/storage/usb.c
Simple merge