diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-02 14:17:13 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-02 14:17:13 +0100 |
| commit | b21a207141d83a06abc5f492b80204602e02ca44 (patch) | |
| tree | f0152cde543008c72d7eb5c12c18095ad92785e6 /drivers/net/niu.h | |
| parent | uwb: remove beacon cache entry after calling uwb_notify() (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-b21a207141d83a06abc5f492b80204602e02ca44.tar.xz linux-b21a207141d83a06abc5f492b80204602e02ca44.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
Diffstat (limited to 'drivers/net/niu.h')
| -rw-r--r-- | drivers/net/niu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 180ca8ae93de..e1a7392e8d70 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h @@ -3243,12 +3243,12 @@ struct niu { #define NIU_FLAGS_XMAC 0x00010000 /* 0=BMAC 1=XMAC */ u32 msg_enable; + char irq_name[NIU_NUM_RXCHAN+NIU_NUM_TXCHAN+3][IFNAMSIZ + 6]; /* Protects hw programming, and ring state. */ spinlock_t lock; const struct niu_ops *ops; - struct net_device_stats net_stats; union niu_mac_stats mac_stats; struct rx_ring_info *rx_rings; |