]> err.no Git - linux-2.6/commit
FS_ENET: OF-related fixup for FEC and SCC MAC's
authorVitaly Bordug <vbordug@ru.mvista.com>
Sat, 27 Jan 2007 08:00:04 +0000 (00:00 -0800)
committerJeff Garzik <jeff@garzik.org>
Tue, 30 Jan 2007 14:36:01 +0000 (09:36 -0500)
commitb1f54ba34f9e036ab515bbac0c01d17300e1c79a
treecf50663a12573623611188f65138f3bd7f711227
parent0c0b3ae68ec93b1db5c637d294647d1cca0df763
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>
drivers/net/fs_enet/mac-fec.c
drivers/net/fs_enet/mac-scc.c
drivers/net/phy/fixed.c