summaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-06-21 23:54:12 +0200
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-06-21 23:54:12 +0200
commitee3c7892ad585e2e702d8975420d25ae052d97bb (patch)
tree71c23600099fe5670482f8900d787dbc7c9551b2 /tmk_core/protocol
parent2d314810086684883329af730d8f5e8ecd0506b0 (diff)
parent1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (diff)
downloadqmk_firmware-ee3c7892ad585e2e702d8975420d25ae052d97bb.tar.gz
qmk_firmware-ee3c7892ad585e2e702d8975420d25ae052d97bb.tar.xz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/lufa/bluetooth.c1
-rw-r--r--tmk_core/protocol/lufa/bluetooth.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa/bluetooth.c b/tmk_core/protocol/lufa/bluetooth.c
index ed66e52c1..549606162 100644
--- a/tmk_core/protocol/lufa/bluetooth.c
+++ b/tmk_core/protocol/lufa/bluetooth.c
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
#include "print.h"
#include "debug.h"
-#include "../serial.h"
#include "bluetooth.h"
void bluefruit_keyboard_print_report(report_keyboard_t *report)
diff --git a/tmk_core/protocol/lufa/bluetooth.h b/tmk_core/protocol/lufa/bluetooth.h
index 01f07e8e6..78ece1cd0 100644
--- a/tmk_core/protocol/lufa/bluetooth.h
+++ b/tmk_core/protocol/lufa/bluetooth.h
@@ -18,6 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef BLUETOOTH_H
#define BLUETOOTH_H
+#include "../serial.h"
+
void bluefruit_serial_send(uint8_t data);
/*