Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] m68k trivial build fixes

amikbd: missing declaration
sun3_NCR5380: more work_struct mess
sun3_NCR5380: cast is not an lvalue

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

authored by

Al Viro and committed by
Linus Torvalds
2bb71b5a 4fb23e43

+4 -4
+1 -1
drivers/input/keyboard/amikbd.c
··· 187 187 188 188 static int __init amikbd_init(void) 189 189 { 190 - int i, j; 190 + int i, j, err; 191 191 192 192 if (!AMIGAHW_PRESENT(AMI_KEYBOARD)) 193 193 return -ENODEV;
+3 -3
drivers/scsi/sun3_NCR5380.c
··· 266 266 (struct NCR5380_hostdata *)(in)->hostdata 267 267 #define HOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata) 268 268 269 - #define NEXT(cmd) ((struct scsi_cmnd *)((cmd)->host_scribble)) 269 + #define NEXT(cmd) (*(struct scsi_cmnd **)&((cmd)->host_scribble)) 270 270 #define NEXTADDR(cmd) ((struct scsi_cmnd **)&((cmd)->host_scribble)) 271 271 272 272 #define HOSTNO instance->host_no ··· 650 650 #include <linux/interrupt.h> 651 651 652 652 static volatile int main_running = 0; 653 - static DECLARE_WORK(NCR5380_tqueue, (void (*)(void*))NCR5380_main, NULL); 653 + static DECLARE_WORK(NCR5380_tqueue, NCR5380_main); 654 654 655 655 static __inline__ void queue_main(void) 656 656 { ··· 1031 1031 * reenable them. This prevents reentrancy and kernel stack overflow. 1032 1032 */ 1033 1033 1034 - static void NCR5380_main (void *bl) 1034 + static void NCR5380_main (struct work_struct *bl) 1035 1035 { 1036 1036 struct scsi_cmnd *tmp, *prev; 1037 1037 struct Scsi_Host *instance = first_instance;