diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:51:52 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:51:52 -0500 |
| commit | 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 (patch) | |
| tree | 7f30dbdccd6c28aa4e8f2c9edb7813a7ae78097b /include/linux/sysctl.h | |
| parent | 11fff8287fdaeb700df79aa8253650b60c7b21e2 (diff) | |
| parent | cccc65a3b60edaf721cdee5a14f68ba009341822 (diff) | |
Merge branch 'upstream'
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 32a4139c4ad8..0e92bf7ec28e 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -146,6 +146,7 @@ enum | |||
| 146 | KERN_RANDOMIZE=68, /* int: randomize virtual address space */ | 146 | KERN_RANDOMIZE=68, /* int: randomize virtual address space */ |
| 147 | KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ | 147 | KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ |
| 148 | KERN_SPIN_RETRY=70, /* int: number of spinlock retries */ | 148 | KERN_SPIN_RETRY=70, /* int: number of spinlock retries */ |
| 149 | KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */ | ||
| 149 | }; | 150 | }; |
| 150 | 151 | ||
| 151 | 152 | ||