diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 22:35:17 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 22:35:17 +0100 |
commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
tree | e1be8645297f8ebe87445251743ebcc52081a20d /arch/um/include/line.h | |
parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus (diff) | |
parent | Add "run_scheduled_work()" workqueue function (diff) | |
download | linux-21b4e736922f546e0f1aa7b9d6c442f309a2444a.tar.xz linux-21b4e736922f546e0f1aa7b9d6c442f309a2444a.zip |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
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 { char *tail; int sigio; - struct work_struct task; + struct delayed_work task; const struct line_driver *driver; int have_irq; }; |