git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
bcm43xx
/
bcm43xx.h
diff --git
a/drivers/net/wireless/bcm43xx/bcm43xx.h
b/drivers/net/wireless/bcm43xx/bcm43xx.h
index
94dfb92
..
8286678
100644
(file)
--- a/
drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/
drivers/net/wireless/bcm43xx/bcm43xx.h
@@
-819,7
+819,7
@@
struct bcm43xx_private {
struct tasklet_struct isr_tasklet;
/* Periodic tasks */
- struct
work_struct
periodic_work;
+ struct
delayed_work
periodic_work;
unsigned int periodic_state;
struct work_struct restart_work;