[patch 04/10] powerpc: rename add_bridge to avoid namespace clashes

Stephen Rothwell sfr at canb.auug.org.au
Tue Jun 12 14:11:08 EST 2007


On Tue, 12 Jun 2007 01:28:28 +0200 arnd at arndb.de wrote:
>
> Many platforms currently define their own add_bridge function, some
> of them globally. This breaks some multiplatform configurations.
> Prefixing each of these functions with the platform name avoids
> this problem.
> 
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> Index: linux-2.6/arch/powerpc/platforms/82xx/mpc82xx_ads.c
> ===================================================================
> --- linux-2.6.orig/arch/powerpc/platforms/82xx/mpc82xx_ads.c
> +++ linux-2.6/arch/powerpc/platforms/82xx/mpc82xx_ads.c
> @@ -49,7 +49,7 @@
>  #include <linux/fs_enet_pd.h>
>  
>  #include <sysdev/fsl_soc.h>
> -#include <../sysdev/cpm2_pic.h>
> +#include <../../sysdev/cpm2_pic.h>

This is a separate fix and so should be a separate patch.  You might also
consider putting that include file in include/asm-powerpc...

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20070612/b7dbcdd1/attachment.pgp>


More information about the Linuxppc-dev mailing list