diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-11 01:54:14 +0400 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-11 02:10:03 +0400 |
| commit | 7ef9fbf08818fa1cb8ae89fca29f193dd78d5dd8 (patch) | |
| tree | 0573648f12cc3322aa92ea699494b5b6232e0247 | |
| parent | 324d36ed26a22bc14b2dd4505f3dba3fb2676bcc (diff) | |
| download | linux-7ef9fbf08818fa1cb8ae89fca29f193dd78d5dd8.tar.xz | |
Bluetooth: Move amp.h header file into net/bluetooth/
The amp.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 | 3 | ||||
| -rw-r--r-- | net/bluetooth/amp.c | 3 | ||||
| -rw-r--r-- | net/bluetooth/amp.h (renamed from include/net/bluetooth/amp.h) | 0 | ||||
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 | ||||
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 3 |
5 files changed, 8 insertions, 4 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index b38d07477c20..9ae32cef1762 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c @@ -16,7 +16,8 @@ #include <net/bluetooth/hci_core.h> #include <net/bluetooth/l2cap.h> #include <net/bluetooth/a2mp.h> -#include <net/bluetooth/amp.h> + +#include "amp.h" /* Global AMP Manager list */ LIST_HEAD(amp_mgr_list); diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c index d459ed43c779..b7b8f4eed661 100644 --- a/net/bluetooth/amp.c +++ b/net/bluetooth/amp.c @@ -15,9 +15,10 @@ #include <net/bluetooth/hci.h> #include <net/bluetooth/hci_core.h> #include <net/bluetooth/a2mp.h> -#include <net/bluetooth/amp.h> #include <crypto/hash.h> +#include "amp.h" + /* Remote AMP Controllers interface */ void amp_ctrl_get(struct amp_ctrl *ctrl) { diff --git a/include/net/bluetooth/amp.h b/net/bluetooth/amp.h index 7ea3db77ba89..7ea3db77ba89 100644 --- a/include/net/bluetooth/amp.h +++ b/net/bluetooth/amp.h diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ada3bf4d7e2a..67316b3e9304 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -30,7 +30,8 @@ #include <net/bluetooth/hci_core.h> #include <net/bluetooth/mgmt.h> #include <net/bluetooth/a2mp.h> -#include <net/bluetooth/amp.h> + +#include "amp.h" /* Handle HCI Event packets */ diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 06e7173c2d13..09f6f61423ff 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -38,7 +38,8 @@ #include <net/bluetooth/l2cap.h> #include <net/bluetooth/smp.h> #include <net/bluetooth/a2mp.h> -#include <net/bluetooth/amp.h> + +#include "amp.h" bool disable_ertm; |