diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-10-02 10:01:27 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-05 20:22:16 (GMT) |
| commit | e2a53458a7ab375233048e922c4adf494866a78f (patch) | |
| tree | 0d703e3070ba43394fae714629c09c998bf5b80d /arch/powerpc/cpu/ppc4xx | |
| parent | d90f0c107bdb9766aeaf11181b97f5d7fde3efda (diff) | |
| download | u-boot-e2a53458a7ab375233048e922c4adf494866a78f.tar.xz | |
net: drop !NET_MULTI code
This is long over due. All but two net drivers have been converted, but
those have now been dropped.
The only thing left to do is actually delete all references to NET_MULTI
and code that is compiled when that is not defined. So here we scrub the
core code.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/powerpc/cpu/ppc4xx')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/miiphy.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c index 9f8f8fa..297155f 100644 --- a/arch/powerpc/cpu/ppc4xx/miiphy.c +++ b/arch/powerpc/cpu/ppc4xx/miiphy.c @@ -187,10 +187,9 @@ int phy_setup_aneg (char *devname, unsigned char addr) */ unsigned int miiphy_getemac_offset(u8 addr) { -#if (defined(CONFIG_440) && \ +#if defined(CONFIG_440) && \ !defined(CONFIG_440SP) && !defined(CONFIG_440SPE) && \ - !defined(CONFIG_460EX) && !defined(CONFIG_460GT)) && \ - defined(CONFIG_NET_MULTI) + !defined(CONFIG_460EX) && !defined(CONFIG_460GT) unsigned long zmii; unsigned long eoffset; @@ -228,7 +227,7 @@ unsigned int miiphy_getemac_offset(u8 addr) return (eoffset); #else -#if defined(CONFIG_NET_MULTI) && defined(CONFIG_405EX) +#if defined(CONFIG_405EX) unsigned long rgmii; int devnum = 1; |