telelco-v0.2: Make config.pad_box override switches

[fw/altos] / src / kernel / ao_config.h

diff --git a/src/kernel/ao_config.h b/src/kernel/ao_config.h
index 3c73ea4948d6264f82c6d7079df5c2706dcaa912..0bbb06d187d22f86a4971648118c635c3250fa33 100644 (file)
--- a/src/kernel/ao_config.h
+++ b/src/kernel/ao_config.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -118,7 +119,7 @@ struct ao_config {
 #if HAS_APRS
        uint8_t         aprs_format;            /* minor version 22 */
 #endif
-#if HAS_FIXED_PAD_BOX
+#if HAS_PAD
        uint8_t         pad_box;                /* minor version 22 */
        uint8_t         pad_idle;               /* minor version 23 */
 #endif