diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-02-13 21:54:46 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-02-13 21:54:46 -0700 |
| commit | e77c24aaaff12669ca6970dfcca770671387f59c (patch) | |
| tree | c8929f4a71290e3a3c3b6d717788ae1837b2dffa /src/product | |
| parent | 85974eadfde6103d297498ee8c4268e28ab008ba (diff) | |
| parent | bf268354535a3a7b2e093235e5347ed2a6d809ff (diff) | |
Merge branch 'branch-1.3' into debian
Diffstat (limited to 'src/product')
| -rw-r--r-- | src/product/ao_flash_pins.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/product/ao_flash_pins.h b/src/product/ao_flash_pins.h index dd67d820..4917ee6f 100644 --- a/src/product/ao_flash_pins.h +++ b/src/product/ao_flash_pins.h @@ -27,7 +27,9 @@ #define HAS_BEEP 0 #define HAS_TASK 0 #define HAS_ECHO 0 +#ifndef HAS_TICK #define HAS_TICK 0 +#endif #define PACKET_HAS_SLAVE 0 |