diff --git a/[refs] b/[refs]
index d6c2dfac119e..214a5f56b037 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35bdd52d7401b1208552523d6fa28d4a37dbc74d
+refs/heads/master: b312b38c7411d4a2fff3fcdff13556b090f80f25
diff --git a/trunk/drivers/scsi/atari_NCR5380.c b/trunk/drivers/scsi/atari_NCR5380.c
index c912733ac077..eff846ae0aff 100644
--- a/trunk/drivers/scsi/atari_NCR5380.c
+++ b/trunk/drivers/scsi/atari_NCR5380.c
@@ -657,7 +657,7 @@ static inline void NCR5380_print_phase(struct Scsi_Host *instance)
 #include <linux/interrupt.h>
 
 static volatile int main_running;
-static DECLARE_WORK(NCR5380_tqueue, (void (*)(void *))NCR5380_main, NULL);
+static DECLARE_WORK(NCR5380_tqueue, NCR5380_main);
 
 static inline void queue_main(void)
 {
@@ -1075,7 +1075,7 @@ static int NCR5380_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
  *  reenable them.  This prevents reentrancy and kernel stack overflow.
  */
 
-static void NCR5380_main(void *bl)
+static void NCR5380_main(struct work_struct *work)
 {
 	Scsi_Cmnd *tmp, *prev;
 	struct Scsi_Host *instance = first_instance;