diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 12:56:10 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 12:56:10 +0900 |
commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /drivers/net/qlge/qlge.h | |
parent | 623eb15647fc35c5a8cd38985d5958240eb072c1 (diff) | |
parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
download | talos-op-linux-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.tar.gz talos-op-linux-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/qlge/qlge.h')
-rw-r--r-- | drivers/net/qlge/qlge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 22821398fc63..9787dff90d3f 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h @@ -2083,6 +2083,7 @@ struct ql_adapter { u32 mailbox_in; u32 mailbox_out; struct mbox_params idc_mbc; + struct mutex mpi_mutex; int tx_ring_size; int rx_ring_size; |