git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
bcm43xx
/
bcm43xx.h
diff --git
a/drivers/net/wireless/bcm43xx/bcm43xx.h
b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 3a064def162e70d7e37547b1e3c97a9b6bc74b33..0e790efae683cfdbe2e17e204ad7667af56871ed 100644
(file)
--- a/
drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/
drivers/net/wireless/bcm43xx/bcm43xx.h
@@
-771,6
+771,7
@@
struct bcm43xx_private {
* This is currently always BCM43xx_BUSTYPE_PCI
*/
u8 bustype;
+ u64 dma_mask;
u16 board_vendor;
u16 board_type;