Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / drivers / ao_pyro_slave.c

diff --git a/src/drivers/ao_pyro_slave.c b/src/drivers/ao_pyro_slave.c
index f07c2cba184ddb47fdd67dfaac6bb53be13c4e38..8ea6d858a76939336854d668cca69be6b785ff7f 100644 (file)
--- a/src/drivers/ao_pyro_slave.c
+++ b/src/drivers/ao_pyro_slave.c
@@ -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
@@ -32,7 +33,7 @@ static const struct ao_companion_setup        ao_telepyro_setup = {
 
 struct ao_config ao_config;
 
-extern volatile __data uint16_t ao_tick_count;
+extern volatile uint16_t ao_tick_count;
 uint16_t ao_boost_tick;
 
 void ao_spi_slave(void)