Re: linux-next: net merge conflicts

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 28 Mar 2008 17:55:30 +1100

> OK, I always thought that we didn't like conditional includes and that
> include files should make themselves safe from being included in
> unexpected circumstances. In particular, until now these include files
> have not caused problems ...

Stephen is this enough to fix your powerpc build failure?

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3b54f8a..8576ca9 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -741,6 +741,7 @@ struct net_device
 #define	NETDEV_ALIGN		32
 #define	NETDEV_ALIGN_CONST	(NETDEV_ALIGN - 1)
 
+#ifdef CONFIG_NET
 /*
  * Net namespace inlines
  */
@@ -761,6 +762,7 @@ void dev_net_set(struct net_device *dev, struct net *net)
 	dev->nd_net = net;
 #endif
 }
+#endif
 
 /**
  *	netdev_priv - access network device private data
--
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html