diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 10:57:19 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 10:57:19 +0100 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /drivers/net/chelsio/common.h | |
| parent | [PATCH] NetXen: multiport firmware support, ioctl interface (diff) | |
| parent | [PATCH] A few small additions and corrections to README (diff) | |
| download | linux-8d1413b28033c49c7f1a4d320e815d7a5531acee.tar.xz linux-8d1413b28033c49c7f1a4d320e815d7a5531acee.zip | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
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 { struct petp *tp; struct port_info port[MAX_NPORTS]; - struct work_struct stats_update_task; + struct delayed_work stats_update_task; struct timer_list stats_update_timer; spinlock_t tpi_lock; |