diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 17:32:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 17:32:22 -0800 |
| commit | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (patch) | |
| tree | d938e61f953ca63a745e7ace4a78c16876509ed5 /drivers/net/tg3.h | |
| parent | 8f28afac3494f573ac774030a1f840b7d6237da2 (diff) | |
| parent | 3860288ee8298bf2784e9a0c37d26d3a82941e35 (diff) | |
| download | kernel_samsung_tuna-15578eeb6cd4b74492f26e60624aa1a9a52ddd7b.zip kernel_samsung_tuna-15578eeb6cd4b74492f26e60624aa1a9a52ddd7b.tar.gz kernel_samsung_tuna-15578eeb6cd4b74492f26e60624aa1a9a52ddd7b.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 890e163..e824330 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2275,6 +2275,7 @@ struct tg3 { dma_addr_t stats_mapping; struct work_struct reset_task; + int nvram_lock_cnt; u32 nvram_size; u32 nvram_pagesize; u32 nvram_jedecnum; |