| commit | b1f54ba34f9e036ab515bbac0c01d17300e1c79a | [log] [tgz] |
|---|---|---|
| author | Vitaly Bordug <vbordug@ru.mvista.com> | Sat Jan 27 00:00:04 2007 -0800 |
| committer | Jeff Garzik <jeff@garzik.org> | Tue Jan 30 09:36:01 2007 -0500 |
| tree | cf50663a12573623611188f65138f3bd7f711227 | |
| 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>