diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
| commit | 165415f700b0c77fa1f8db6198f48582639adf78 (patch) | |
| tree | 088e305b0b5b0c6753072e13be1177824c3ed59d /include/linux/sysctl.h | |
| parent | c324b44c34050cf2a9b58830e11c974806bd85d8 (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 532a6c5c24e9..3a29a9f9b451 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -544,7 +544,8 @@ enum { | |||
| 544 | NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE=8, | 544 | NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE=8, |
| 545 | NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT=9, | 545 | NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT=9, |
| 546 | NET_NETROM_ROUTING_CONTROL=10, | 546 | NET_NETROM_ROUTING_CONTROL=10, |
| 547 | NET_NETROM_LINK_FAILS_COUNT=11 | 547 | NET_NETROM_LINK_FAILS_COUNT=11, |
| 548 | NET_NETROM_RESET=12 | ||
| 548 | }; | 549 | }; |
| 549 | 550 | ||
| 550 | /* /proc/sys/net/ax25 */ | 551 | /* /proc/sys/net/ax25 */ |