diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 15:48:15 -0500 |
| commit | 34161db6b14d984fb9b06c735b7b42f8803f6851 (patch) | |
| tree | 99656278b6697f1cde5b05894b7c0ee22c63a00e /drivers/net/chelsio/common.h | |
| parent | 5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts:
include/linux/sunrpc/xprt.h
net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
Diffstat (limited to 'drivers/net/chelsio/common.h')
| -rw-r--r-- | drivers/net/chelsio/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index b265941e1372..74758d2c7af8 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h | |||
| @@ -279,7 +279,7 @@ struct adapter { | |||
| 279 | struct petp *tp; | 279 | struct petp *tp; |
| 280 | 280 | ||
| 281 | struct port_info port[MAX_NPORTS]; | 281 | struct port_info port[MAX_NPORTS]; |
| 282 | struct work_struct stats_update_task; | 282 | struct delayed_work stats_update_task; |
| 283 | struct timer_list stats_update_timer; | 283 | struct timer_list stats_update_timer; |
| 284 | 284 | ||
| 285 | spinlock_t tpi_lock; | 285 | spinlock_t tpi_lock; |