From 404fcce68ef302cf9ec2aeb0e07befe6d0bb3f39 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 5 Mar 2008 18:47:40 -0800
Subject: [PATCH] --- yaml --- r: 87224 b: refs/heads/master c:
 a4e2acf01a7e5fcd960fc332335ca10313641f4b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/bnep/bnep.h | 2 +-
 trunk/net/bluetooth/bnep/sock.c | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8619443a9605..20516c1f5e02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04005dd9ae7bf1031408869c33df96149ebb1086
+refs/heads/master: a4e2acf01a7e5fcd960fc332335ca10313641f4b
diff --git a/trunk/net/bluetooth/bnep/bnep.h b/trunk/net/bluetooth/bnep/bnep.h
index a2992280c3d1..e69244dd8de8 100644
--- a/trunk/net/bluetooth/bnep/bnep.h
+++ b/trunk/net/bluetooth/bnep/bnep.h
@@ -174,7 +174,7 @@ struct bnep_session {
 
 void bnep_net_setup(struct net_device *dev);
 int bnep_sock_init(void);
-int bnep_sock_cleanup(void);
+void bnep_sock_cleanup(void);
 
 static inline int bnep_mc_hash(__u8 *addr)
 {
diff --git a/trunk/net/bluetooth/bnep/sock.c b/trunk/net/bluetooth/bnep/sock.c
index 81065e548a1f..201e5b1ce473 100644
--- a/trunk/net/bluetooth/bnep/sock.c
+++ b/trunk/net/bluetooth/bnep/sock.c
@@ -257,12 +257,10 @@ int __init bnep_sock_init(void)
 	return err;
 }
 
-int __exit bnep_sock_cleanup(void)
+void __exit bnep_sock_cleanup(void)
 {
 	if (bt_sock_unregister(BTPROTO_BNEP) < 0)
 		BT_ERR("Can't unregister BNEP socket");
 
 	proto_unregister(&bnep_proto);
-
-	return 0;
 }