diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-12-07 05:31:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 17:39:20 +0100 |
| commit | a2ce774096110ccc5c02cbdc05897d005fcd3db8 (patch) | |
| tree | 6a6a5830a7e4e789afbfc8258e70e7889af5e7ea /arch/um/include | |
| parent | [PATCH] skip data conversion in compat_sys_mount when data_page is NULL (diff) | |
| download | linux-a2ce774096110ccc5c02cbdc05897d005fcd3db8.tar.xz linux-a2ce774096110ccc5c02cbdc05897d005fcd3db8.zip | |
[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')
| -rw-r--r-- | arch/um/include/chan_kern.h | 2 | ||||
| -rw-r--r-- | arch/um/include/line.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/chan_kern.h b/arch/um/include/chan_kern.h index 572d286ed2c6..9003a343e148 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); diff --git a/arch/um/include/line.h b/arch/um/include/line.h index 7be24811bb30..214ee76c40df 100644 --- a/arch/um/include/line.h +++ b/arch/um/include/line.h @@ -51,7 +51,7 @@ struct line { char *tail; int sigio; - struct work_struct task; + struct delayed_work task; const struct line_driver *driver; int have_irq; }; |