Move bluetooth device_type changes to 14-device-type.patch

This belongs here.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/patches/14-device-type.patch b/compat/patches/14-device-type.patch
index 676d7a46e9d0d2855ffeeae0ebfc24d8ecd7aef5..9f2f433b59f2a4f50fc66bc411f722ba05f2a2f1 100644 (file)
--- a/compat/patches/14-device-type.patch
+++ b/compat/patches/14-device-type.patch
@@ -20,3 +20,17 @@ compile warning.
  
  static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                                         unsigned long state,
+--- a/net/bluetooth/bnep/core.c        2009-12-10 09:22:58.000000000 -0800
++++ b/net/bluetooth/bnep/core.c        2009-12-10 09:22:59.000000000 -0800
+@@ -536,9 +536,11 @@ static struct device *bnep_get_device(st
+       return conn ? &conn->dev : NULL;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+ static struct device_type bnep_type = {
+       .name   = "bluetooth",
+ };
++#endif
+ 
+ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
+ {

diff --git a/compat/patches/16-bluetooth.patch b/compat/patches/16-bluetooth.patch
index 8a739ab7ecf45de49c34a26a0646cab71e91709c..93f9ab389d18f587ab5d574c278cf95516c282c7 100644 (file)
--- a/compat/patches/16-bluetooth.patch
+++ b/compat/patches/16-bluetooth.patch
@@ -41,20 +41,6 @@ diff -Nur a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
                if (amount < 0)
                        amount = 0;
                err = put_user(amount, (int __user *) arg);
---- a/net/bluetooth/bnep/core.c        2009-12-10 09:22:58.000000000 -0800
-+++ b/net/bluetooth/bnep/core.c        2009-12-10 09:22:59.000000000 -0800
-@@ -536,9 +536,11 @@ static struct device *bnep_get_device(st
-       return conn ? &conn->dev : NULL;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
- static struct device_type bnep_type = {
-       .name   = "bluetooth",
- };
-+#endif
- 
- int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
- {
 diff -Nur a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
 --- a/net/bluetooth/cmtp/capi.c        2009-11-25 11:24:43.000000000 +0530
 +++ b/net/bluetooth/cmtp/capi.c        2009-11-26 16:43:42.000000000 +0530