timer: Cleanup and warning removal from driver and test

[bertos.git] / bertos / mware / formatwr.h

diff --git a/bertos/mware/formatwr.h b/bertos/mware/formatwr.h
index 5854bd4aa6d3123d6448cdc1b13ca7f4d9ea5aa3..865fbfd4daff018beaafb583b71053fc1e5473ef 100644 (file)
--- a/bertos/mware/formatwr.h
+++ b/bertos/mware/formatwr.h
@@ -38,10 +38,12 @@
 #ifndef MWARE_FORMATWR_H
 #define MWARE_FORMATWR_H
 
-#include <stdarg.h> /* va_list */
-#include <appconfig.h>
+#include "cfg/cfg_formatwr.h"
+
 #include <cpu/attr.h>    /* CPU_HARVARD */
 
+#include <stdarg.h>      /* va_list */
+
 /**
  * \name _formatted_write() configuration
  * \{
@@ -66,7 +68,7 @@ _formatted_write(
        va_list ap);
 
 #if CPU_HARVARD
-       #include <mware/pgm.h>
+       #include <cpu/pgm.h>
        int _formatted_write_P(
                const char * PROGMEM format,
                void put_char_func(char c, void *user_data),