diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
| commit | 09e4f9029da1b53e835555c353a89c36b71233b0 (patch) | |
| tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /include/linux/sysctl.h | |
| parent | 750b50ab5687125d8a1dc946d931b00acf016e2c (diff) | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 | ||