diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /net/rxrpc | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/main.c b/net/rxrpc/main.c index 36fdcbcd80d..48cbd065bb4 100644 --- a/net/rxrpc/main.c +++ b/net/rxrpc/main.c @@ -79,8 +79,8 @@ static int __init rxrpc_initialise(void) error_sysctl: #ifdef CONFIG_SYSCTL rxrpc_sysctl_cleanup(); -#endif error_proc: +#endif #ifdef CONFIG_PROC_FS rxrpc_proc_cleanup(); #endif |