diff --git a/[refs] b/[refs] index 3efc96e7e8bd..757a710756e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7282d491ecaee9883233a0e27283c4c79486279a +refs/heads/master: c233289c29369dba7177ca873e9b8ed457af2a78 diff --git a/trunk/drivers/net/phy/fixed.c b/trunk/drivers/net/phy/fixed.c index 341036df4710..19f7ee63276f 100644 --- a/trunk/drivers/net/phy/fixed.c +++ b/trunk/drivers/net/phy/fixed.c @@ -313,8 +313,10 @@ MODULE_LICENSE("GPL"); static int __init fixed_init(void) { +#if 0 int ret; int duplex = 0; +#endif /* register on the bus... Not expected to be matched with anything there... */ phy_driver_register(&fixed_mdio_driver); @@ -335,8 +337,10 @@ static int __init fixed_init(void) */ #ifdef CONFIG_FIXED_MII_DUPLEX +#if 0 duplex = 1; #endif +#endif #ifdef CONFIG_FIXED_MII_100_FDX fixed_mdio_register_device(0, 100, 1);