Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / net / inet_common.h

diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index e9bb476..227adcb 100644 (file)
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -1,13 +1,8 @@
 #ifndef _INET_COMMON_H
 #define _INET_COMMON_H
 
-#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
-extern struct proto_ops                inet_stream_ops;
-extern struct proto_ops                inet_dgram_ops;
-#else
 extern const struct proto_ops          inet_stream_ops;
 extern const struct proto_ops          inet_dgram_ops;
-#endif
 
 /*
  *     INET4 prototypes used by INET6