From: Vitaly Bordug <vbordug@ru.mvista.com>
Date: Sat, 27 Jan 2007 08:00:04 +0000 (-0800)
Subject: FS_ENET: OF-related fixup for FEC and SCC MAC's
X-Git-Tag: v2.6.20-rc7~18^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1f54ba34f9e036ab515bbac0c01d17300e1c79a;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed