diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 16:34:37 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 16:34:37 -0400 |
| commit | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch) | |
| tree | 35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /include/linux/sysctl.h | |
| parent | 442d207eb0b4e7047c4fedccd900c425e689d502 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 772998147e3e..23032d9d6071 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -399,6 +399,7 @@ enum | |||
| 399 | NET_IPV4_CONF_FORCE_IGMP_VERSION=17, | 399 | NET_IPV4_CONF_FORCE_IGMP_VERSION=17, |
| 400 | NET_IPV4_CONF_ARP_ANNOUNCE=18, | 400 | NET_IPV4_CONF_ARP_ANNOUNCE=18, |
| 401 | NET_IPV4_CONF_ARP_IGNORE=19, | 401 | NET_IPV4_CONF_ARP_IGNORE=19, |
| 402 | NET_IPV4_CONF_PROMOTE_SECONDARIES=20, | ||
| 402 | __NET_IPV4_CONF_MAX | 403 | __NET_IPV4_CONF_MAX |
| 403 | }; | 404 | }; |
| 404 | 405 | ||