diff options
Diffstat (limited to 'drivers/sbus/char')
| -rw-r--r-- | drivers/sbus/char/bpp.c | 5 | ||||
| -rw-r--r-- | drivers/sbus/char/sab82532.c | 5 | ||||
| -rw-r--r-- | drivers/sbus/char/su.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index 86914758b..a19028c6f 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c @@ -20,10 +20,10 @@ #include <linux/ioport.h> #include <linux/major.h> -#include <asm/uaccess.h> +#include <asm/uaccess.h> +#include <asm/io.h> #if defined(__i386__) -# include <asm/io.h> # include <asm/system.h> # include <asm/segment.h> #endif @@ -34,7 +34,6 @@ # include <asm/oplib.h> /* OpenProm Library */ # include <asm/sbus.h> /* struct linux_sbus *SBus_chain */ -# include <asm/io.h> /* sparc_alloc_io() */ #endif #include <asm/bpp.h> diff --git a/drivers/sbus/char/sab82532.c b/drivers/sbus/char/sab82532.c index 82c7e61e0..1387a6f15 100644 --- a/drivers/sbus/char/sab82532.c +++ b/drivers/sbus/char/sab82532.c @@ -1,4 +1,4 @@ -/* $Id: sab82532.c,v 1.31 1999/05/12 11:15:10 davem Exp $ +/* $Id: sab82532.c,v 1.32 1999/07/03 08:57:41 davem Exp $ * sab82532.c: ASYNC Driver for the SIEMENS SAB82532 DUSCC. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -1672,7 +1672,6 @@ static void sab82532_wait_until_sent(struct tty_struct *tty, int timeout) #endif while (info->xmit_cnt || !info->all_sent) { current->state = TASK_INTERRUPTIBLE; - current->counter = 0; schedule_timeout(char_time); if (signal_pending(current)) break; @@ -2136,7 +2135,7 @@ sab82532_kgdb_hook(int line)) __initfunc(static inline void show_serial_version(void)) { - char *revision = "$Revision: 1.31 $"; + char *revision = "$Revision: 1.32 $"; char *version, *p; version = strchr(revision, ' '); diff --git a/drivers/sbus/char/su.c b/drivers/sbus/char/su.c index b80b93e92..b1c95163c 100644 --- a/drivers/sbus/char/su.c +++ b/drivers/sbus/char/su.c @@ -1,4 +1,4 @@ -/* $Id: su.c,v 1.21 1999/06/11 10:23:42 davem Exp $ +/* $Id: su.c,v 1.22 1999/07/03 08:57:43 davem Exp $ * su.c: Small serial driver for keyboard/mouse interface on sparc32/PCI * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -1836,7 +1836,6 @@ su_wait_until_sent(struct tty_struct *tty, int timeout) printk("lsr = %d (jiff=%lu)...", lsr, jiffies); #endif current->state = TASK_INTERRUPTIBLE; - current->counter = 0; /* make us low-priority */ schedule_timeout(char_time); if (signal_pending(current)) break; @@ -2215,7 +2214,7 @@ done: */ __initfunc(static __inline__ void show_su_version(void)) { - char *revision = "$Revision: 1.21 $"; + char *revision = "$Revision: 1.22 $"; char *version, *p; version = strchr(revision, ' '); |