diff --git a/[refs] b/[refs] index 1d24a4e91cac..61991f283732 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcfef8c3681fa59b653871682956a8fdf5c27c5a +refs/heads/master: 13f7b8c011cd8d16ad3063409b9d969466c9e2f4 diff --git a/trunk/drivers/net/skge.h b/trunk/drivers/net/skge.h index dd0fd45c7155..1a57bdd1ddf1 100644 --- a/trunk/drivers/net/skge.h +++ b/trunk/drivers/net/skge.h @@ -1351,8 +1351,6 @@ enum { PHY_M_PC_EN_DET_PLUS = 3<<8, /* Energy Detect Plus (Mode 2) */ }; -#define PHY_M_PC_MDI_XMODE(x) ((((u16)(x)<<5) & PHY_M_PC_MDIX_MSK) - enum { PHY_M_PC_MAN_MDI = 0, /* 00 = Manual MDI configuration */ PHY_M_PC_MAN_MDIX = 1, /* 01 = Manual MDIX configuration */