aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authorGravatar Christopher Browne <cbbrowne@ca.afilias.info>2016-07-04 12:32:08 -0400
committerGravatar Christopher Browne <cbbrowne@ca.afilias.info>2016-07-04 12:32:08 -0400
commit2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d (patch)
tree9d8e9c6b71116f01c56c870a9e1071760899ff77 /quantum/quantum.h
parent44a5f7630f18b40b36270d49449a43cd42b802f0 (diff)
parent9e01b219f32b0086728c10658928b8bffcc26ef7 (diff)
downloadqmk_firmware-2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d.tar.gz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r--quantum/quantum.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 9b5d310bd..3a0b74202 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -1,7 +1,12 @@
#ifndef QUANTUM_H
#define QUANTUM_H
+#if defined(__AVR__)
#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#endif
+#include "wait.h"
#include "matrix.h"
#include "keymap.h"
#ifdef BACKLIGHT_ENABLE
@@ -14,12 +19,9 @@
#include "action_layer.h"
#include "eeconfig.h"
#include <stddef.h>
-#include <avr/io.h>
-#include <util/delay.h>
#include "bootloader.h"
#include "timer.h"
#include "config_common.h"
-#include <avr/interrupt.h>
#include "led.h"
#include "action_util.h"
#include <stdlib.h>