From de57799530d3184722532f93d156364067d8fcd5 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 28 May 2016 11:56:06 -0400
Subject: brings alps64 up-to-date (needs testing)

---
 quantum/matrix.c  | 6 ++++--
 quantum/quantum.h | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'quantum')

diff --git a/quantum/matrix.c b/quantum/matrix.c
index d5fd7def8a..412662a794 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -68,8 +68,10 @@ uint8_t matrix_cols(void) {
 
 void matrix_init(void) {
     /* frees PORTF by setting the JTD bit twice within four cycles */
-    MCUCR |= _BV(JTD);
-    MCUCR |= _BV(JTD);
+    #ifdef __AVR_ATmega32U4__
+        MCUCR |= _BV(JTD);
+        MCUCR |= _BV(JTD);
+    #endif
     /* initializes the I/O pins */
 #if DIODE_DIRECTION == COL2ROW
     for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) {
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 69a0d8126a..71533f48b9 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -23,6 +23,7 @@
 #include "eeconfig.h"
 #include <stddef.h>
 #include <avr/io.h>
+#include <util/delay.h>
 
 extern uint32_t default_layer_state;
 
-- 
cgit v1.2.3