From 5baaf9073b0662d2a246221ea6d40581b004c51e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 28 Mar 2008 15:53:11 -0700
Subject: [PATCH] --- yaml --- r: 90444 b: refs/heads/master c:
 1567ca7eec7664b8be3b07755ac59dc1b1ec76cb h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b705d842634b..0ce323b6634e 100644
--- 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
index 3b54f8a2c055..8576ca928dae 100644
--- 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