diff options
Diffstat (limited to 'drivers/acorn')
| -rw-r--r-- | drivers/acorn/char/keyb_arc.c | 3 | ||||
| -rw-r--r-- | drivers/acorn/char/keyb_ps2.c | 1 | ||||
| -rw-r--r-- | drivers/acorn/scsi/fas216.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acorn/char/keyb_arc.c b/drivers/acorn/char/keyb_arc.c index 4e37bb9d0..93dd19ff3 100644 --- a/drivers/acorn/char/keyb_arc.c +++ b/drivers/acorn/char/keyb_arc.c @@ -33,6 +33,7 @@ #include "../../char/busmouse.h" +extern struct tasklet_struct keyboard_tasklet; extern void kbd_reset_kdown(void); #define VERSION 108 @@ -402,7 +403,7 @@ static void a5kkbd_rx(int irq, void *dev_id, struct pt_regs *regs) { kbd_pt_regs = regs; if (handle_rawcode(inb(IOC_KARTRX))) - mark_bh (KEYBOARD_BH); + tasklet_schedule(&keyboard_tasklet); } static void a5kkbd_tx(int irq, void *dev_id, struct pt_regs *regs) diff --git a/drivers/acorn/char/keyb_ps2.c b/drivers/acorn/char/keyb_ps2.c index 8d26b37b1..abd25b16d 100644 --- a/drivers/acorn/char/keyb_ps2.c +++ b/drivers/acorn/char/keyb_ps2.c @@ -341,6 +341,5 @@ int __init ps2kbd_init_hw(void) (void)IOMD_KARTRX; restore_flags (flags); - printk (KERN_INFO "PS/2 keyboard driver v%d.%02d\n", VERSION/100, VERSION%100); return 0; } diff --git a/drivers/acorn/scsi/fas216.c b/drivers/acorn/scsi/fas216.c index 85503d534..c0f39caea 100644 --- a/drivers/acorn/scsi/fas216.c +++ b/drivers/acorn/scsi/fas216.c @@ -2463,7 +2463,7 @@ int fas216_eh_host_reset(Scsi_Cmnd *SCpnt) * IRQs after the sleep. */ spin_unlock_irq(&io_request_lock); - scsi_sleep(5); + scsi_sleep(25*HZ/100); spin_lock_irq(&io_request_lock); /* @@ -2628,7 +2628,7 @@ int fas216_init(struct Scsi_Host *instance) * scsi standard says wait 250ms */ spin_unlock_irq(&io_request_lock); - scsi_sleep(5); + scsi_sleep(25*HZ/100); spin_lock_irq(&io_request_lock); outb(info->scsi.cfg[0], REG_CNTL1(info)); |