summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-04-13 08:53:43 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-04-13 08:53:43 -0700
commit45f96af1e303ff666cb3c6ac2bf241e667c6f856 (patch)
tree96091faf66c1ba8e5a2e5b4f517faffc5d196144 /include/linux
parent51af77dbb806a3df044de15301d51488202bdfce (diff)
parent697a7d5de2b1465a7d6e83c8651921a301f27e42 (diff)
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include/linux')
-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 d2224f6617f9..a098e6ab9e8d 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 */
};