[patch 02/16] replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver

Benjamin Herrenschmidt benh at kernel.crashing.org
Fri Nov 3 09:20:50 EST 2006


On Thu, 2006-11-02 at 13:55 +0100, s.hauer at pengutronix.de wrote:
> plain text document attachment
> (drivers-net-tulip-de4x5-remove-MULTIPLATFORM.diff)
> 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: Sascha Hauer <s.hauer at pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

> Index: linux-2.6/drivers/net/tulip/de4x5.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/tulip/de4x5.c
> +++ linux-2.6/drivers/net/tulip/de4x5.c
> @@ -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);
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev




More information about the Linuxppc-dev mailing list