aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/defs.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-22 11:18:40 -0700
committerDavid S. Miller <davem@davemloft.net>2009-07-22 11:18:40 -0700
commitd14a7679ae9b7d4eb4b92e81f5039b719fd98c4d (patch)
treecb12e313178092e92136704660d68f7ce6578d19 /drivers/net/wireless/libertas/defs.h
parentde72e5de062e48a992d6cafe2291a82fe498d641 (diff)
parent154839962a582b8eb661cde94ef3af0e03b374d7 (diff)
downloadkernel_replicant_linux-d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d.tar.gz
kernel_replicant_linux-d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d.tar.bz2
kernel_replicant_linux-d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/defs.h')
-rw-r--r--drivers/net/wireless/libertas/defs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index 48da157d6cda..72f3479a4d70 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -234,6 +234,8 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
/** Mesh enable bit in FW capability */
#define MESH_CAPINFO_ENABLE_MASK (1<<16)
+/** FW definition from Marvell v4 */
+#define MRVL_FW_V4 (0x04)
/** FW definition from Marvell v5 */
#define MRVL_FW_V5 (0x05)
/** FW definition from Marvell v10 */