summaryrefslogtreecommitdiff
path: root/include/linux/sysctl.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-04-03 04:06:01 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2004-04-03 04:06:01 -0800
commitd0bf0688b8a803c5ba2c99fe4a257998382e9dce (patch)
treeff9b0af772af3e004761d955fb0d56f7a66d35d5 /include/linux/sysctl.h
parent6a9f6b3fb8117adf7930e8eda52e6551a620885d (diff)
parenta7054210fc6cbc4cd185d04f2087006f802f534c (diff)
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r--include/linux/sysctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 3767428df94d..ffe3ee41a2ff 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -131,6 +131,7 @@ enum
KERN_PRINTK_RATELIMIT_BURST=61, /* int: tune printk ratelimiting */
KERN_PTY=62, /* dir: pty driver */
KERN_NGROUPS_MAX=63, /* int: NGROUPS_MAX */
+ KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
};