diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /include/linux/aio.h | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'include/linux/aio.h')
| -rw-r--r-- | include/linux/aio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index 0d71c0041f13..9e350fd44d77 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h | |||
| @@ -194,7 +194,7 @@ struct kioctx { | |||
| 194 | 194 | ||
| 195 | struct aio_ring_info ring_info; | 195 | struct aio_ring_info ring_info; |
| 196 | 196 | ||
| 197 | struct work_struct wq; | 197 | struct delayed_work wq; |
| 198 | }; | 198 | }; |
| 199 | 199 | ||
| 200 | /* prototypes */ | 200 | /* prototypes */ |