summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/b43.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-04 13:03:12 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-04 13:06:46 +1100
commitcf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch)
tree8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/wireless/b43/b43.h
parenteabeb7dac4934602a90b14649c07c13eb7e43d90 (diff)
parent3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff)
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
-rw-r--r--drivers/net/wireless/b43/b43.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 427b8203e3f9..a53c378e7484 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -718,7 +718,6 @@ struct b43_wldev {
bool bad_frames_preempt; /* Use "Bad Frames Preemption" (default off) */
bool dfq_valid; /* Directed frame queue valid (IBSS PS mode, ATIM) */
- bool short_slot; /* TRUE, if short slot timing is enabled. */
bool radio_hw_enable; /* saved state of radio hardware enabled state */
bool suspend_in_progress; /* TRUE, if we are in a suspend/resume cycle */