diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /net/irda/irsysctl.c | |
parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'net/irda/irsysctl.c')
-rw-r--r-- | net/irda/irsysctl.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c index 86805c3d8324..bb53ba0be585 100644 --- a/net/irda/irsysctl.c +++ b/net/irda/irsysctl.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************* | 1 | /********************************************************************* |
2 | * | 2 | * |
3 | * Filename: irsysctl.c | 3 | * Filename: irsysctl.c |
4 | * Version: 1.0 | 4 | * Version: 1.0 |
5 | * Description: Sysctl interface for IrDA | 5 | * Description: Sysctl interface for IrDA |
@@ -8,19 +8,19 @@ | |||
8 | * Created at: Sun May 24 22:12:06 1998 | 8 | * Created at: Sun May 24 22:12:06 1998 |
9 | * Modified at: Fri Jun 4 02:50:15 1999 | 9 | * Modified at: Fri Jun 4 02:50:15 1999 |
10 | * Modified by: Dag Brattli <dagb@cs.uit.no> | 10 | * Modified by: Dag Brattli <dagb@cs.uit.no> |
11 | * | 11 | * |
12 | * Copyright (c) 1997, 1999 Dag Brattli, All Rights Reserved. | 12 | * Copyright (c) 1997, 1999 Dag Brattli, All Rights Reserved. |
13 | * Copyright (c) 2000-2001 Jean Tourrilhes <jt@hpl.hp.com> | 13 | * Copyright (c) 2000-2001 Jean Tourrilhes <jt@hpl.hp.com> |
14 | * | 14 | * |
15 | * This program is free software; you can redistribute it and/or | 15 | * This program is free software; you can redistribute it and/or |
16 | * modify it under the terms of the GNU General Public License as | 16 | * modify it under the terms of the GNU General Public License as |
17 | * published by the Free Software Foundation; either version 2 of | 17 | * published by the Free Software Foundation; either version 2 of |
18 | * the License, or (at your option) any later version. | 18 | * the License, or (at your option) any later version. |
19 | * | 19 | * |
20 | * Neither Dag Brattli nor University of Tromsų admit liability nor | 20 | * Neither Dag Brattli nor University of Tromsų admit liability nor |
21 | * provide warranty for any of this software. This material is | 21 | * provide warranty for any of this software. This material is |
22 | * provided "AS-IS" and at no charge. | 22 | * provided "AS-IS" and at no charge. |
23 | * | 23 | * |
24 | ********************************************************************/ | 24 | ********************************************************************/ |
25 | 25 | ||
26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
@@ -111,7 +111,7 @@ static ctl_table irda_table[] = { | |||
111 | .strategy = &sysctl_string | 111 | .strategy = &sysctl_string |
112 | }, | 112 | }, |
113 | #ifdef CONFIG_IRDA_DEBUG | 113 | #ifdef CONFIG_IRDA_DEBUG |
114 | { | 114 | { |
115 | .ctl_name = DEBUG, | 115 | .ctl_name = DEBUG, |
116 | .procname = "debug", | 116 | .procname = "debug", |
117 | .data = &irda_debug, | 117 | .data = &irda_debug, |
@@ -121,7 +121,7 @@ static ctl_table irda_table[] = { | |||
121 | }, | 121 | }, |
122 | #endif | 122 | #endif |
123 | #ifdef CONFIG_IRDA_FAST_RR | 123 | #ifdef CONFIG_IRDA_FAST_RR |
124 | { | 124 | { |
125 | .ctl_name = FAST_POLL, | 125 | .ctl_name = FAST_POLL, |
126 | .procname = "fast_poll_increase", | 126 | .procname = "fast_poll_increase", |
127 | .data = &sysctl_fast_poll_increase, | 127 | .data = &sysctl_fast_poll_increase, |
@@ -287,7 +287,7 @@ int __init irda_sysctl_register(void) | |||
287 | * Unregister our sysctl interface | 287 | * Unregister our sysctl interface |
288 | * | 288 | * |
289 | */ | 289 | */ |
290 | void __exit irda_sysctl_unregister(void) | 290 | void __exit irda_sysctl_unregister(void) |
291 | { | 291 | { |
292 | unregister_sysctl_table(irda_table_header); | 292 | unregister_sysctl_table(irda_table_header); |
293 | } | 293 | } |