diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /drivers/net/phy/fixed.c | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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); |