diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 20:56:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 20:56:24 -0800 |
| commit | 77eebf346dfe87587ee8a54c76349a996e80c24f (patch) | |
| tree | d8b7685cbc7dbc993ec39d3028e6f0246924bf40 /include/linux | |
| parent | 2641dfd981e4a3eebf387f21cf10685af06e1641 (diff) | |
| parent | d2b176ed878d4d5fcc0bd35656dfd373f3702af9 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/linux')
| -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 0e92bf7ec28..bac61db2645 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -147,6 +147,7 @@ enum KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ KERN_SPIN_RETRY=70, /* int: number of spinlock retries */ KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */ + KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */ }; |