Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[cascardo/linux.git] / include / linux / sysctl.h

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index bd27fbc..9f236cd 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -483,6 +483,7 @@ enum
        NET_IPV4_CONF_ARP_NOTIFY=22,
        NET_IPV4_CONF_ACCEPT_LOCAL=23,
        NET_IPV4_CONF_SRC_VMARK=24,
+       NET_IPV4_CONF_PROXY_ARP_PVLAN=25,
        __NET_IPV4_CONF_MAX
 };