diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/sungem.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/sungem.h')
| -rw-r--r-- | drivers/net/sungem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index f7a02917ce5e..19905460def6 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h | |||
| @@ -1031,8 +1031,8 @@ struct gem { | |||
| 1031 | #endif | 1031 | #endif |
| 1032 | }; | 1032 | }; |
| 1033 | 1033 | ||
| 1034 | #define found_mii_phy(gp) ((gp->phy_type == phy_mii_mdio0 || gp->phy_type == phy_mii_mdio1) \ | 1034 | #define found_mii_phy(gp) ((gp->phy_type == phy_mii_mdio0 || gp->phy_type == phy_mii_mdio1) && \ |
| 1035 | && gp->phy_mii.def && gp->phy_mii.def->ops) | 1035 | gp->phy_mii.def && gp->phy_mii.def->ops) |
| 1036 | 1036 | ||
| 1037 | #define ALIGNED_RX_SKB_ADDR(addr) \ | 1037 | #define ALIGNED_RX_SKB_ADDR(addr) \ |
| 1038 | ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr)) | 1038 | ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr)) |