diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-10 14:54:15 -0700 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-11 00:10:05 +0200 |
| commit | 7024728ee534d739380dc4fd31f020cfc6e86c28 (patch) | |
| tree | 5c1d0b8ebd9d25eadd60d770f1267a4b35df98f7 | |
| parent | 7ef9fbf08818fa1cb8ae89fca29f193dd78d5dd8 (diff) | |
| download | kernel-common-7024728ee534d739380dc4fd31f020cfc6e86c28.tar.gz kernel-common-7024728ee534d739380dc4fd31f020cfc6e86c28.tar.bz2 kernel-common-7024728ee534d739380dc4fd31f020cfc6e86c28.zip | |
Bluetooth: Move a2mp.h header file into net/bluetooth/
The a2mp.h header file is only used internally by the bluetooth.ko
module and is not a public API. So make it local to the core
Bluetooth module.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | net/bluetooth/a2mp.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/a2mp.h (renamed from include/net/bluetooth/a2mp.h) | 0 | ||||
| -rw-r--r-- | net/bluetooth/amp.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/hci_conn.c | 3 | ||||
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index 9ae32cef1762..7e25be3e8a79 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c @@ -15,8 +15,8 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> #include <net/bluetooth/l2cap.h> -#include <net/bluetooth/a2mp.h> +#include "a2mp.h" #include "amp.h" /* Global AMP Manager list */ diff --git a/include/net/bluetooth/a2mp.h b/net/bluetooth/a2mp.h index 487b54c1308f..487b54c1308f 100644 --- a/include/net/bluetooth/a2mp.h +++ b/net/bluetooth/a2mp.h diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c index b7b8f4eed661..5497ed3f2e3d 100644 --- a/net/bluetooth/amp.c +++ b/net/bluetooth/amp.c @@ -14,9 +14,9 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci.h> #include <net/bluetooth/hci_core.h> -#include <net/bluetooth/a2mp.h> #include <crypto/hash.h> +#include "a2mp.h" #include "amp.h" /* Remote AMP Controllers interface */ diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index dedd1ea5dd4c..8141c8d83139 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -28,9 +28,10 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#include <net/bluetooth/a2mp.h> #include <net/bluetooth/smp.h> +#include "a2mp.h" + struct sco_param { u16 pkt_type; u16 max_latency; diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 67316b3e9304..bbe2d292c4a9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -29,8 +29,8 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> #include <net/bluetooth/mgmt.h> -#include <net/bluetooth/a2mp.h> +#include "a2mp.h" #include "amp.h" /* Handle HCI Event packets */ diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 09f6f61423ff..947e18691e92 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -37,8 +37,8 @@ #include <net/bluetooth/hci_core.h> #include <net/bluetooth/l2cap.h> #include <net/bluetooth/smp.h> -#include <net/bluetooth/a2mp.h> +#include "a2mp.h" #include "amp.h" bool disable_ertm; |