diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /net/irda/irmod.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'net/irda/irmod.c')
| -rw-r--r-- | net/irda/irmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irmod.c b/net/irda/irmod.c index 1900937b3328..8ba703da2797 100644 --- a/net/irda/irmod.c +++ b/net/irda/irmod.c | |||
| @@ -128,8 +128,8 @@ static int __init irda_init(void) | |||
| 128 | out_err_3: | 128 | out_err_3: |
| 129 | #ifdef CONFIG_SYSCTL | 129 | #ifdef CONFIG_SYSCTL |
| 130 | irda_sysctl_unregister(); | 130 | irda_sysctl_unregister(); |
| 131 | #endif | ||
| 132 | out_err_2: | 131 | out_err_2: |
| 132 | #endif | ||
| 133 | #ifdef CONFIG_PROC_FS | 133 | #ifdef CONFIG_PROC_FS |
| 134 | irda_proc_unregister(); | 134 | irda_proc_unregister(); |
| 135 | #endif | 135 | #endif |