m68k trivial build fixes
Subsystems (2)
PATCH 1/1 m68k trivial build fixes
amikbd: missing declarationsun3_NCR5380: more work_struct messsun3_NCR5380: cast is not an lvalue
Signed-off-by Al Viro <[email protected]>
---
drivers/input/keyboard/amikbd.c +1 -1
@@ -187,7 +187,7 @@ static irqreturn_t amikbd_interrupt(intstatic int __init amikbd_init (void ) { -int i, j; +int i, j, err;if (!AMIGAHW_PRESENT (AMI_KEYBOARD ))return -ENODEV ;
drivers/scsi/sun3_NCR5380.c +3 -3
@@ -266,7 +266,7 @@ #define SETUP_HOSTDATA(in) \ (struct NCR5380_hostdata *)(in)->hostdata#define HOSTDATA (in) ((struct NCR5380_hostdata *)(in)->hostdata) -#define NEXT (cmd) ((struct scsi_cmnd *)((cmd)->host_scribble)) +#define NEXT (cmd) (*(struct scsi_cmnd **)&((cmd)->host_scribble))#define NEXTADDR (cmd) ((struct scsi_cmnd **)&((cmd)->host_scribble))#define HOSTNO instance->host_no
@@ -650,7 +650,7 @@ #include <linux/workqueue.h>#include <linux/interrupt.h> static volatile int main_running =0 ; -static DECLARE_WORK(NCR5380_tqueue, (void (*)(void*))NCR5380_main, NULL); +static DECLARE_WORK(NCR5380_tqueue, NCR5380_main);static __inline__void queue_main (void ) {
@@ -1031,7 +1031,7 @@ #endif* reenable them. This prevents reentrancy and kernel stack overflow. */ -static void NCR5380_main (void *bl) +static void NCR5380_main (struct work_struct *bl) {struct scsi_cmnd *tmp, *prev;struct Scsi_Host *instance = first_instance;