git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
[pandora-kernel.git]
/
net
/
bluetooth
/
af_bluetooth.c
diff --git
a/net/bluetooth/af_bluetooth.c
b/net/bluetooth/af_bluetooth.c
index
f6348e0
..
8f9431a
100644
(file)
--- a/
net/bluetooth/af_bluetooth.c
+++ b/
net/bluetooth/af_bluetooth.c
@@
-37,10
+37,7
@@
#include <linux/poll.h>
#include <net/sock.h>
#include <asm/ioctls.h>
#include <linux/poll.h>
#include <net/sock.h>
#include <asm/ioctls.h>
-
-#if defined(CONFIG_KMOD)
#include <linux/kmod.h>
#include <linux/kmod.h>
-#endif
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/bluetooth.h>
@@
-145,11
+142,8
@@
static int bt_sock_create(struct net *net, struct socket *sock, int proto)
if (proto < 0 || proto >= BT_MAX_PROTO)
return -EINVAL;
if (proto < 0 || proto >= BT_MAX_PROTO)
return -EINVAL;
-#if defined(CONFIG_KMOD)
- if (!bt_proto[proto]) {
+ if (!bt_proto[proto])
request_module("bt-proto-%d", proto);
request_module("bt-proto-%d", proto);
- }
-#endif
err = -EPROTONOSUPPORT;
err = -EPROTONOSUPPORT;