diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-27 10:20:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-27 10:20:22 +0100 |
commit | 257c2a02a8f668ea195bcb56eebbddc1af718e5e (patch) | |
tree | 27ccff43bc36d119dc3afeaf610638a56f4bf3ea /drivers/net/ethernet/emulex/benet/be.h | |
parent | 0712eea349d8e2b6d0e44b94a752d999319027fb (diff) | |
parent | a8c136d2eba7b0b0c872e59eb404b1fe36504112 (diff) |
Merge tag 'asoc-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.8-rc4
The usual set of driver updates, nothing too thrilling in here - one
core change for the regulator bypass mode which was just not doing the
right thing at all and a bunch of driver specifics.
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be.h')
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 3bc1912afba9..4eba17b83ba8 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -190,6 +190,7 @@ struct be_eq_obj { u8 idx; /* array index */ u16 tx_budget; + u16 spurious_intr; struct napi_struct napi; struct be_adapter *adapter; } ____cacheline_aligned_in_smp; |