diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
| commit | f6f223039c0d0683bdea1eabd35b309e10311a60 (patch) | |
| tree | 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6 /drivers/net/wireless/libertas/dev.h | |
| parent | b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 (diff) | |
| parent | 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/dev.h')
| -rw-r--r-- | drivers/net/wireless/libertas/dev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index c348aff8f309..6977ee820214 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h | |||
| @@ -109,7 +109,6 @@ struct lbs_private { | |||
| 109 | struct list_head cmdpendingq; /* pending command buffers */ | 109 | struct list_head cmdpendingq; /* pending command buffers */ |
| 110 | wait_queue_head_t cmd_pending; | 110 | wait_queue_head_t cmd_pending; |
| 111 | struct timer_list command_timer; | 111 | struct timer_list command_timer; |
| 112 | int nr_retries; | ||
| 113 | int cmd_timed_out; | 112 | int cmd_timed_out; |
| 114 | 113 | ||
| 115 | /* Command responses sent from the hardware to the driver */ | 114 | /* Command responses sent from the hardware to the driver */ |