diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/net/b44.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/net/b44.h')
| -rw-r--r-- | drivers/net/b44.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/b44.h b/drivers/net/b44.h index 7db0c84a7950..e678498de6db 100644 --- a/drivers/net/b44.h +++ b/drivers/net/b44.h | |||
| @@ -395,7 +395,7 @@ struct b44 { | |||
| 395 | u32 rx_pending; | 395 | u32 rx_pending; |
| 396 | u32 tx_pending; | 396 | u32 tx_pending; |
| 397 | u8 phy_addr; | 397 | u8 phy_addr; |
| 398 | 398 | u8 force_copybreak; | |
| 399 | struct mii_if_info mii_if; | 399 | struct mii_if_info mii_if; |
| 400 | }; | 400 | }; |
| 401 | 401 | ||