aboutsummaryrefslogtreecommitdiff
path: root/include/net/bluetooth/bluetooth.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-11 01:48:37 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-11 01:48:37 -0400
commit1a04392bd6439876b1552793389cbb5be356ea54 (patch)
tree12af7b77e3b0848127f2d2871778c9c1f315578a /include/net/bluetooth/bluetooth.h
parent68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff)
parent3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff)
Merge branch 'master'
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
-rw-r--r--include/net/bluetooth/bluetooth.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 6dfa4a61ffd..21045862484 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -136,7 +136,7 @@ struct bt_skb_cb {
};
#define bt_cb(skb) ((struct bt_skb_cb *)(skb->cb))
-static inline struct sk_buff *bt_skb_alloc(unsigned int len, unsigned int __nocast how)
+static inline struct sk_buff *bt_skb_alloc(unsigned int len, gfp_t how)
{
struct sk_buff *skb;