diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/phy/fixed.c | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/phy/fixed.c')
| -rw-r--r-- | drivers/net/phy/fixed.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 341036df471..19f7ee63276 100644 --- a/drivers/net/phy/fixed.c +++ b/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); |