diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/b43legacy/b43legacy.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/b43legacy/b43legacy.h')
| -rw-r--r-- | drivers/net/wireless/b43legacy/b43legacy.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h index 038baa8869e2..89fe2f972c72 100644 --- a/drivers/net/wireless/b43legacy/b43legacy.h +++ b/drivers/net/wireless/b43legacy/b43legacy.h | |||
| @@ -29,8 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #define B43legacy_IRQWAIT_MAX_RETRIES 20 | 30 | #define B43legacy_IRQWAIT_MAX_RETRIES 20 |
| 31 | 31 | ||
| 32 | #define B43legacy_RX_MAX_SSI 60 /* best guess at max ssi */ | ||
| 33 | |||
| 34 | /* MMIO offsets */ | 32 | /* MMIO offsets */ |
| 35 | #define B43legacy_MMIO_DMA0_REASON 0x20 | 33 | #define B43legacy_MMIO_DMA0_REASON 0x20 |
| 36 | #define B43legacy_MMIO_DMA0_IRQ_MASK 0x24 | 34 | #define B43legacy_MMIO_DMA0_IRQ_MASK 0x24 |