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 /drivers/net/wireless/bcm43xx/bcm43xx.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 'drivers/net/wireless/bcm43xx/bcm43xx.h')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h index 94dfb92fab5c..8286678513b9 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx.h | |||
| @@ -819,7 +819,7 @@ struct bcm43xx_private { | |||
| 819 | struct tasklet_struct isr_tasklet; | 819 | struct tasklet_struct isr_tasklet; |
| 820 | 820 | ||
| 821 | /* Periodic tasks */ | 821 | /* Periodic tasks */ |
| 822 | struct work_struct periodic_work; | 822 | struct delayed_work periodic_work; |
| 823 | unsigned int periodic_state; | 823 | unsigned int periodic_state; |
| 824 | 824 | ||
| 825 | struct work_struct restart_work; | 825 | struct work_struct restart_work; |