summaryrefslogtreecommitdiff
path: root/digital/io/src/eeprom.avr.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-21 00:46:03 +0100
committerNicolas Schodet2012-03-21 18:56:51 +0100
commit1e7c8a8a9811c45091e6c471482086113f059f40 (patch)
treed7faa80dd162799c394ec23925cc53b6dbff008e /digital/io/src/eeprom.avr.c
parent0feb542a8cf7630a5d442387727414f5251aad83 (diff)
parentdcb79f383269440ec2c5a54b6d7792fbb0110d5a (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/aux.c digital/mimot/src/dirty/aux.h digital/mimot/src/dirty/contacts.h digital/mimot/src/dirty/main.c digital/mimot/src/dirty/models.host.c digital/mimot/src/dirty/twi_proto.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'digital/io/src/eeprom.avr.c')
-rw-r--r--digital/io/src/eeprom.avr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/digital/io/src/eeprom.avr.c b/digital/io/src/eeprom.avr.c
index a32b9606..febba55c 100644
--- a/digital/io/src/eeprom.avr.c
+++ b/digital/io/src/eeprom.avr.c
@@ -26,8 +26,8 @@
#include "common.h"
#include "eeprom.h"
-#include "servo.h" /* SERVO_NUMBER */
-#include "servo_pos.h"
+#include "modules/devices/servo/servo.h"
+#include "modules/devices/servo/servo_pos.h"
#include <avr/eeprom.h> /* eeprom_{read,write}_byte */