diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/sbus | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/pcikbd.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/sunkbd.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/sunmouse.c | 4 | ||||
| -rw-r--r-- | drivers/sbus/char/uctrl.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/sbus/char/pcikbd.c b/drivers/sbus/char/pcikbd.c index dc34fe4cd..3857c487d 100644 --- a/drivers/sbus/char/pcikbd.c +++ b/drivers/sbus/char/pcikbd.c @@ -764,7 +764,7 @@ void pcimouse_interrupt(int irq, void *dev_id, struct pt_regs *regs) queue->head = head; aux_ready = 1; if (queue->fasync) - kill_fasync(queue->fasync, SIGIO); + kill_fasync(queue->fasync, SIGIO, POLL_IN); wake_up_interruptible(&queue->proc_list); } diff --git a/drivers/sbus/char/sunkbd.c b/drivers/sbus/char/sunkbd.c index e8e6a168c..2b3a99604 100644 --- a/drivers/sbus/char/sunkbd.c +++ b/drivers/sbus/char/sunkbd.c @@ -1273,7 +1273,7 @@ push_kbd (int scan) kbd_head = next; } if (kb_fasync) - kill_fasync (kb_fasync, SIGIO); + kill_fasync (kb_fasync, SIGIO, POLL_IN); wake_up_interruptible (&kbd_wait); } diff --git a/drivers/sbus/char/sunmouse.c b/drivers/sbus/char/sunmouse.c index 77fe2ee77..c3d8462e6 100644 --- a/drivers/sbus/char/sunmouse.c +++ b/drivers/sbus/char/sunmouse.c @@ -137,7 +137,7 @@ push_char (char c) } sunmouse.ready = 1; if (sunmouse.fasync) - kill_fasync (sunmouse.fasync, SIGIO); + kill_fasync (sunmouse.fasync, SIGIO, POLL_IN); wake_up_interruptible (&sunmouse.proc_list); } @@ -334,7 +334,7 @@ sun_mouse_inbyte(unsigned char byte) */ sunmouse.ready = 1; if (sunmouse.fasync) - kill_fasync (sunmouse.fasync, SIGIO); + kill_fasync (sunmouse.fasync, SIGIO, POLL_IN); wake_up_interruptible(&sunmouse.proc_list); } return; diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index b11de29eb..ccf2268d8 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c @@ -92,7 +92,7 @@ static struct miscdevice uctrl_dev = { #ifdef MODULE int init_module(void) #else -__initfunc(int uctrl_init(void)) +int __init uctrl_init(void) #endif { struct uctrl_driver *driver = &drv; |