diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2013-04-01 23:36:32 +0200 |
---|---|---|
committer | Johannes Berg <johannes@sipsolutions.net> | 2013-04-01 23:36:32 +0200 |
commit | 4cf8410dd8b1f54600eefae73d695b004559e01e (patch) | |
tree | 6f861fb837e8a572f605cf3ca509efe6d18e098b /patches/collateral-evolutions/network | |
parent | ee21c030314154ceac7f3748e161a160d72c5cce (diff) |
fix bluetooth ifdef
The recent kconfig shuffle broke this.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'patches/collateral-evolutions/network')
9 files changed, 10 insertions, 10 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index 8af75fff..019bf549 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -4,7 +4,7 @@ } EXPORT_SYMBOL(bt_sock_unregister); -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int bt_sock_create(struct net *net, struct socket *sock, int proto, int kern) +#else @@ -17,7 +17,7 @@ read_lock(&bt_proto_lock); if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) err = bt_proto[proto]->create(net, sock, proto, kern); +#else + err = bt_proto[proto]->create(net, sock, proto); diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch index a5ebf798..1b6a5cae 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch @@ -4,7 +4,7 @@ .obj_size = sizeof(struct bt_sock) }; -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int bnep_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch index 68f6afbf..d2ad2515 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch @@ -4,7 +4,7 @@ .obj_size = sizeof(struct bt_sock) }; -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch index 430fb33b..9f7a573e 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch @@ -18,7 +18,7 @@ .obj_size = sizeof(struct hci_pinfo) }; -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int hci_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch index 87d60146..8970690b 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch @@ -4,7 +4,7 @@ return ret; } -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, unsigned char report_type) { diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch index f3bf8019..9658f2b2 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch @@ -4,7 +4,7 @@ .obj_size = sizeof(struct bt_sock) }; -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int hidp_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch index a57f33ab..56e920be 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch @@ -18,7 +18,7 @@ return sk; } -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch index a9f9c533..6aa1e848 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch @@ -4,7 +4,7 @@ return sk; } -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int rfcomm_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch index ea1a53c0..004869ae 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch @@ -4,7 +4,7 @@ return sk; } -+#if defined(CPTCFG_BACKPORT_BT_SOCK_CREATE_NEEDS_KERN) ++#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) static int sco_sock_create(struct net *net, struct socket *sock, int protocol, int kern) +#else |