diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 14:37:56 +0000 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 14:37:56 +0000 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /net/rose | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/rose_route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index a22542fa1bc8..7252344779a0 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -396,7 +396,7 @@ int rose_add_loopback_neigh(void) int rose_add_loopback_node(rose_address *address) { struct rose_node *rose_node; - unsigned int err = 0; + int err = 0; spin_lock_bh(&rose_node_list_lock); @@ -432,7 +432,7 @@ int rose_add_loopback_node(rose_address *address) out: spin_unlock_bh(&rose_node_list_lock); - return 0; + return err; } /* |