diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/net/skge.h | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/net/skge.h')
| -rw-r--r-- | drivers/net/skge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index 17caccbb7685..831de1b6e96e 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h | |||
| @@ -2423,6 +2423,8 @@ struct skge_hw { | |||
| 2423 | u16 phy_addr; | 2423 | u16 phy_addr; |
| 2424 | spinlock_t phy_lock; | 2424 | spinlock_t phy_lock; |
| 2425 | struct tasklet_struct phy_task; | 2425 | struct tasklet_struct phy_task; |
| 2426 | |||
| 2427 | char irq_name[0]; /* skge@pci:000:04:00.0 */ | ||
| 2426 | }; | 2428 | }; |
| 2427 | 2429 | ||
| 2428 | enum pause_control { | 2430 | enum pause_control { |