diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-07 11:13:22 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-07 11:13:22 -0400 |
| commit | 97dfbd1afce005392aa8f067e89bdf95334bdea5 (patch) | |
| tree | 1b198dd239bcb49564c31f124978abde0b467a81 /quantum/quantum.c | |
| parent | 2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d (diff) | |
| parent | ad43d450ca1b988d196da80e2a745f45f24068f6 (diff) | |
| download | firmware-97dfbd1afce005392aa8f067e89bdf95334bdea5.tar.gz firmware-97dfbd1afce005392aa8f067e89bdf95334bdea5.tar.bz2 firmware-97dfbd1afce005392aa8f067e89bdf95334bdea5.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index d59bd5a3f..d8e43a465 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -89,7 +89,7 @@ bool process_record_quantum(keyrecord_t *record) { shutdown_user(); #endif wait_ms(250); - #ifdef ATREUS_ASTAR + #ifdef CATERINA_BOOTLOADER *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific #endif bootloader_jump(); |