diff options
author | Andrew Morton <akpm@osdl.org> | 2006-12-06 23:31:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:20 -0500 |
commit | a2ce774096110ccc5c02cbdc05897d005fcd3db8 (patch) | |
tree | 6a6a5830a7e4e789afbfc8258e70e7889af5e7ea /arch/um/include/line.h | |
parent | 822191a2fa1584a29c3224ab328507adcaeac1ab (diff) |
[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/line.h')
-rw-r--r-- | arch/um/include/line.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 { | |||
51 | char *tail; | 51 | char *tail; |
52 | 52 | ||
53 | int sigio; | 53 | int sigio; |
54 | struct work_struct task; | 54 | struct delayed_work task; |
55 | const struct line_driver *driver; | 55 | const struct line_driver *driver; |
56 | int have_irq; | 56 | int have_irq; |
57 | }; | 57 | }; |