Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

diff --combined include/net/bluetooth/bluetooth.h
index 144d1d5dd82f807a6d49242c219d0306a0d52d59,cf8bcb2553338e99d4f01024361b43e2544521f9..968166a45f86718ab1badc888f9b7788e6e825cf
--- 1/include/net/bluetooth/bluetooth.h
--- 2/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@@ -81,12 -81,6 +81,6 @@@ enum 
        BT_CLOSED
  };
  
- /* Endianness conversions */
- #define htobs(a)      __cpu_to_le16(a)
- #define htobl(a)      __cpu_to_le32(a)
- #define btohs(a)      __le16_to_cpu(a)
- #define btohl(a)      __le32_to_cpu(a)
- 
  /* BD Address */
  typedef struct {
        __u8 b[6];
@@@ -171,6 -165,15 +165,6 @@@ static inline struct sk_buff *bt_skb_se
        return skb;
  }
  
 -static inline int skb_frags_no(struct sk_buff *skb)
 -{
 -      register struct sk_buff *frag = skb_shinfo(skb)->frag_list;
 -      register int n = 1;
 -
 -      for (; frag; frag=frag->next, n++);
 -      return n;
 -}
 -
  int bt_err(__u16 code);
  
  extern int hci_sock_init(void);