diff options
| author | Vitaly Bordug | 2007-01-27 00:00:04 -0800 |
|---|---|---|
| committer | Jeff Garzik | 2007-01-30 09:36:01 -0500 |
| commit | b1f54ba34f9e036ab515bbac0c01d17300e1c79a (patch) | |
| tree | cf50663a12573623611188f65138f3bd7f711227 /drivers/net/phy | |
| parent | 0c0b3ae68ec93b1db5c637d294647d1cca0df763 (diff) | |
FS_ENET: OF-related fixup for FEC and SCC MAC's
Updated direct resource pass with ioremap call, make it grant proper IRQ
mapping, stuff incompatible with the new approach were respectively put
under #ifndef CONFIG_PPC_MERGE. It is required so that both ppc and
powerpc could utilize fs_enet effectively.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 096d4a100bf2..86135397f430 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -349,7 +349,7 @@ static int __init fixed_init(void) fixed_mdio_register_device(0, 100, 1); #endif -#ifdef CONFIX_FIXED_MII_10_FDX +#ifdef CONFIG_FIXED_MII_10_FDX fixed_mdio_register_device(0, 10, 1); #endif return 0; |