summaryrefslogtreecommitdiffstats
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authorNathan Sharfi <me@ngalt.com>2016-05-30 15:45:17 -0700
committerNathan Sharfi <me@ngalt.com>2016-05-30 15:45:17 -0700
commit222e8f031cef1d53c4d4ea33b3970193fcd070fa (patch)
tree0e10f397d2bf4ed5a3aced723fb3e97b09875d49 /quantum/matrix.c
parent13810e4822d57553caa5aea537af7e80ad701589 (diff)
parent8ee9be11dee3db265cd8a0cc22a8fe40f6067820 (diff)
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/matrix.c')
-rw-r--r--quantum/matrix.c6
1 files changed, 4 insertions, 2 deletions
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) {