diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 10:52:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 10:52:45 -0500 |
commit | 07ce198a1eb3431d04a6d59ea9fb7b71f21e33b1 (patch) | |
tree | fe6e6208bdcdfb7bbb0c81923efcb75bf73a299b /drivers/net/wireless/b43/b43.h | |
parent | 4bc87e62775052aac0be7574d5f84ff06f61c6b4 (diff) | |
parent | a442585952f137bd4cdb1f2f3166e4157d383b82 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits)
[NIU]: Bump driver version and release date.
[NIU]: Fix BMAC alternate MAC address indexing.
net: fix kernel-doc warnings in header files
[IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route.
[IPV6]: dst_entry leak in ip4ip6_err. (resend)
bluetooth: do not move child device other than rfcomm
bluetooth: put hci dev after del conn
[NET]: Elminate spurious print_mac() calls.
[BLUETOOTH] hci_sysfs.c: Kill build warning.
[NET]: Remove MAC_FMT
net/8021q/vlan_dev.c: Use print_mac.
[XFRM]: Fix ordering issue in xfrm_dst_hash_transfer().
[BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros
[IPV6]: Fix hardcoded removing of old module code
[NETLABEL]: Move some initialization code into __init section.
[NETLABEL]: Shrink the genl-ops registration code.
[AX25] ax25_out: check skb for NULL in ax25_kick()
[TCP]: Fix tcp_v4_send_synack() comment
[IPV4]: fix alignment of IP-Config output
Documentation: fix tcp.txt
...
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
-rw-r--r-- | drivers/net/wireless/b43/b43.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index 08a011f0834a..f13346ba9dd2 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
@@ -14,6 +14,12 @@ | |||
14 | #include "lo.h" | 14 | #include "lo.h" |
15 | #include "phy.h" | 15 | #include "phy.h" |
16 | 16 | ||
17 | |||
18 | /* The unique identifier of the firmware that's officially supported by | ||
19 | * this driver version. */ | ||
20 | #define B43_SUPPORTED_FIRMWARE_ID "FW13" | ||
21 | |||
22 | |||
17 | #ifdef CONFIG_B43_DEBUG | 23 | #ifdef CONFIG_B43_DEBUG |
18 | # define B43_DEBUG 1 | 24 | # define B43_DEBUG 1 |
19 | #else | 25 | #else |