git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
rxrpc
/
main.c
diff --git
a/net/rxrpc/main.c
b/net/rxrpc/main.c
index
36fdcbc
..
48cbd06
100644
(file)
--- 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();
error_sysctl:
#ifdef CONFIG_SYSCTL
rxrpc_sysctl_cleanup();
-#endif
error_proc:
error_proc:
+#endif
#ifdef CONFIG_PROC_FS
rxrpc_proc_cleanup();
#endif
#ifdef CONFIG_PROC_FS
rxrpc_proc_cleanup();
#endif