diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
| commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
| tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /kernel/sysctl.c | |
| parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
| parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) | |
Merge branch 'net-const'
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index acf6c1550f27..de2d9109194e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -667,7 +667,7 @@ static ctl_table kern_table[] = { | |||
| 667 | .data = &acpi_video_flags, | 667 | .data = &acpi_video_flags, |
| 668 | .maxlen = sizeof (unsigned long), | 668 | .maxlen = sizeof (unsigned long), |
| 669 | .mode = 0644, | 669 | .mode = 0644, |
| 670 | .proc_handler = &proc_dointvec, | 670 | .proc_handler = &proc_doulongvec_minmax, |
| 671 | }, | 671 | }, |
| 672 | #endif | 672 | #endif |
| 673 | #ifdef CONFIG_IA64 | 673 | #ifdef CONFIG_IA64 |