diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 12:25:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 12:25:53 -0500 |
| commit | 2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c (patch) | |
| tree | afe1107cd252595a8d99c292c9f68ee1b5d15364 /kernel | |
| parent | 97bd7919e2c1445dabbcc2686795dbb52316b923 (diff) | |
| parent | 9cb1200a286799db897e81bc2b2c1730cfdc9c08 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC]: Add missing of_node_put
[SPARC64]: check for possible NULL pointer dereference
[SPARC]: Add missing "space"
[SPARC64]: Add missing "space"
[SPARC64]: Add missing pci_dev_put
[SYSCTL_CHECK]: Fix typo in KERN_SPARC_SCONS_PWROFF entry string.
[SPARC64]: Missing mdesc_release() in ldc_init().
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index 6972f26c65f7..bed939f82c31 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.c | |||
| @@ -96,7 +96,7 @@ static struct trans_ctl_table trans_kern_table[] = { | |||
| 96 | 96 | ||
| 97 | { KERN_PTY, "pty", trans_pty_table }, | 97 | { KERN_PTY, "pty", trans_pty_table }, |
| 98 | { KERN_NGROUPS_MAX, "ngroups_max" }, | 98 | { KERN_NGROUPS_MAX, "ngroups_max" }, |
| 99 | { KERN_SPARC_SCONS_PWROFF, "scons_poweroff" }, | 99 | { KERN_SPARC_SCONS_PWROFF, "scons-poweroff" }, |
| 100 | { KERN_HZ_TIMER, "hz_timer" }, | 100 | { KERN_HZ_TIMER, "hz_timer" }, |
| 101 | { KERN_UNKNOWN_NMI_PANIC, "unknown_nmi_panic" }, | 101 | { KERN_UNKNOWN_NMI_PANIC, "unknown_nmi_panic" }, |
| 102 | { KERN_BOOTLOADER_TYPE, "bootloader_type" }, | 102 | { KERN_BOOTLOADER_TYPE, "bootloader_type" }, |