diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-12-06 20:31:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:20 -0800 |
| commit | a2ce774096110ccc5c02cbdc05897d005fcd3db8 (patch) | |
| tree | 6a6a5830a7e4e789afbfc8258e70e7889af5e7ea /arch/um/include/chan_kern.h | |
| parent | 822191a2fa1584a29c3224ab328507adcaeac1ab (diff) | |
| download | op-kernel-dev-a2ce774096110ccc5c02cbdc05897d005fcd3db8.zip op-kernel-dev-a2ce774096110ccc5c02cbdc05897d005fcd3db8.tar.gz | |
[PATCH] uml: workqueue build fix
arch/um/drivers/chan_kern.c:643: error: conflicting types for 'chan_interrupt'
arch/um/include/chan_kern.h:31: error: previous declaration of 'chan_interrupt'
Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/include/chan_kern.h')
| -rw-r--r-- | arch/um/include/chan_kern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/chan_kern.h b/arch/um/include/chan_kern.h index 572d286..9003a34 100644 --- a/arch/um/include/chan_kern.h +++ b/arch/um/include/chan_kern.h @@ -27,7 +27,7 @@ struct chan { void *data; }; -extern void chan_interrupt(struct list_head *chans, struct work_struct *task, +extern void chan_interrupt(struct list_head *chans, struct delayed_work *task, struct tty_struct *tty, int irq); extern int parse_chan_pair(char *str, struct line *line, int device, const struct chan_opts *opts); |
