diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-04-03 22:04:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 22:04:33 +0200 |
| commit | a4aa834a9165150252c5cd953faab4de29d51b87 (patch) | |
| tree | e96e20355057dfabd279b7b7c94fedeffed4e020 /lib | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/... (diff) | |
| download | linux-a4aa834a9165150252c5cd953faab4de29d51b87.tar.xz linux-a4aa834a9165150252c5cd953faab4de29d51b87.zip | |
[NETNS]: Declare init_net even without CONFIG_NET defined.
This does not look good, but there is no other choice. The compilation
without CONFIG_NET is broken and can not be fixed with ease.
After that there is no need for the following commits:
1567ca7eec7664b8be3b07755ac59dc1b1ec76cb
3edf8fa5ccf10688a9280b5cbca8ed3947c42866
2d38f9a4f8d2ebdc799f03eecf82345825495711
Revert them.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject_uevent.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 0d56dad319ad..b06185ed1895 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -19,12 +19,10 @@ #include <linux/kobject.h> #include <linux/module.h> -#ifdef CONFIG_NET #include <linux/socket.h> #include <linux/skbuff.h> #include <linux/netlink.h> #include <net/sock.h> -#endif u64 uevent_seqnum; |