diff options
| author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
|---|---|---|
| committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
| commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
| tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /tmk_core/common/magic.c | |
| parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
| parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'tmk_core/common/magic.c')
| -rw-r--r-- | tmk_core/common/magic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/common/magic.c b/tmk_core/common/magic.c index f21d1346c7..194e4cc026 100644 --- a/tmk_core/common/magic.c +++ b/tmk_core/common/magic.c @@ -1,6 +1,8 @@ #include <stdint.h> #include <stdbool.h> +#if defined(__AVR__) #include <util/delay.h> +#endif #include "matrix.h" #include "bootloader.h" #include "debug.h" @@ -33,4 +35,4 @@ void magic(void) default_layer = eeconfig_read_default_layer(); default_layer_set((uint32_t)default_layer); -}
\ No newline at end of file +} |