diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /drivers/net/skge.h | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/skge.h')
| -rw-r--r-- | drivers/net/skge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index 1f1ce88c8186..ed19ff47ce11 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h | |||
| @@ -2388,6 +2388,7 @@ struct skge_ring { | |||
| 2388 | struct skge_hw { | 2388 | struct skge_hw { |
| 2389 | void __iomem *regs; | 2389 | void __iomem *regs; |
| 2390 | struct pci_dev *pdev; | 2390 | struct pci_dev *pdev; |
| 2391 | spinlock_t hw_lock; | ||
| 2391 | u32 intr_mask; | 2392 | u32 intr_mask; |
| 2392 | struct net_device *dev[2]; | 2393 | struct net_device *dev[2]; |
| 2393 | 2394 | ||
| @@ -2399,9 +2400,8 @@ struct skge_hw { | |||
| 2399 | u32 ram_size; | 2400 | u32 ram_size; |
| 2400 | u32 ram_offset; | 2401 | u32 ram_offset; |
| 2401 | u16 phy_addr; | 2402 | u16 phy_addr; |
| 2402 | 2403 | struct work_struct phy_work; | |
| 2403 | struct tasklet_struct ext_tasklet; | 2404 | struct mutex phy_mutex; |
| 2404 | spinlock_t phy_lock; | ||
| 2405 | }; | 2405 | }; |
| 2406 | 2406 | ||
| 2407 | enum { | 2407 | enum { |