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>
git-mirror · Oct 10, 2013 · 7024728 · 7024728
1 parent 7ef9fbf
commit 7024728
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git 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 → net/bluetooth/a2mp.h b/include/net/bluetooth/a2mp.h → net/bluetooth/a2mp.h
diff --git 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
@@ -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
@@ -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
@@ -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;