Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfaadcad authored by Sascha Hauer's avatar Sascha Hauer Committed by Paul Mackerras
Browse files

[PATCH] Replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver 



Replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in
drivers/net/tulip/de4x5.c.  It is needed for a pmac specific hook but
has nothing with to do with PPC_MULTIPLATFORM.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 74a9d5f1

drivers/net/tulip/de4x5.c

+4 −4
Original line number Diff line number Diff line
@@ -473,9 +473,9 @@ 
#include <asm/byteorder.h>

#include <asm/unaligned.h>

#include <asm/uaccess.h>

#ifdef CONFIG_PPC_MULTIPLATFORM

#ifdef CONFIG_PPC_PMAC

#include <asm/machdep.h>

#endif /* CONFIG_PPC_MULTIPLATFORM */

#endif /* CONFIG_PPC_PMAC */



#include "de4x5.h"
@@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev) 
    /* If possible, try to fix a broken card - SMC only so far */

    srom_repair(dev, broken);



#ifdef CONFIG_PPC_MULTIPLATFORM

#ifdef CONFIG_PPC_PMAC

    /*

    ** If the address starts with 00 a0, we have to bit-reverse

    ** each byte of the address.
@@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev) 
		    dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1);

	    }

    }

#endif /* CONFIG_PPC_MULTIPLATFORM */

#endif /* CONFIG_PPC_PMAC */



    /* Test for a bad enet address */

    status = test_bad_enet(dev, status);