diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-28 04:09:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-28 04:09:23 -0700 |
| commit | 984e13d3641262e1309128296c350bba78f8e79f (patch) | |
| tree | 5fba7534f484dd5e99fd6bab90b42dc2ddc7bb56 /include/linux | |
| parent | 621f56264a8a49cdb69d23614c9bf43465a21468 (diff) | |
| parent | ba04edba7c78a6f4e097b44ac855bfc7587d2277 (diff) | |
Automerge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sysctl.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index c7315c266f83..06aee50b7008 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -172,7 +172,6 @@ enum NET_TR=14, NET_DECNET=15, NET_ECONET=16, - NET_KHTTPD=17 }; /* /proc/sys/kernel/random */ @@ -494,23 +493,6 @@ enum { NET_DECNET_DEBUG_LEVEL = 255 }; -/* /proc/sys/net/khttpd/ */ -enum { - NET_KHTTPD_DOCROOT = 1, - NET_KHTTPD_START = 2, - NET_KHTTPD_STOP = 3, - NET_KHTTPD_UNLOAD = 4, - NET_KHTTPD_CLIENTPORT = 5, - NET_KHTTPD_PERMREQ = 6, - NET_KHTTPD_PERMFORBID = 7, - NET_KHTTPD_LOGGING = 8, - NET_KHTTPD_SERVERPORT = 9, - NET_KHTTPD_DYNAMICSTRING= 10, - NET_KHTTPD_SLOPPYMIME = 11, - NET_KHTTPD_THREADS = 12, - NET_KHTTPD_MAXCONNECT = 13 -}; - /* /proc/sys/net/decnet/conf/<dev> */ enum { NET_DECNET_CONF_LOOPBACK = -2, |