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>
This commit is contained in:
committed by
Jeff Garzik
parent
0c0b3ae68e
commit
b1f54ba34f
@ -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;
|
||||
|
Reference in New Issue
Block a user