---

yaml --- r: 90444 b: refs/heads/master c: 1567ca7 h: refs/heads/master v: v3
git-mirror · Mar 28, 2008 · 5baaf90 · 5baaf90
1 parent bacf5f1
commit 5baaf90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0736ffc04eec239cce9fd3c6ae5dce54e14c25c7
+refs/heads/master: 1567ca7eec7664b8be3b07755ac59dc1b1ec76cb
diff --git a/trunk/include/linux/netdevice.h b/trunk/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