From d1b9efa5a2d5211f73a96f806fa39663bb7160c5 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 9 Jul 2015 12:51:06 +0000
Subject: [PATCH] Fixed bug #611.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8073 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/nil/ports/AVR/nilcore.h | 9 ---------
 readme.txt                 | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/os/nil/ports/AVR/nilcore.h b/os/nil/ports/AVR/nilcore.h
index 28d06ce1e..3da48c262 100644
--- a/os/nil/ports/AVR/nilcore.h
+++ b/os/nil/ports/AVR/nilcore.h
@@ -122,15 +122,6 @@
    asm module.*/
 #if !defined(_FROM_ASM_)
 
-/**
- * @brief   Type of system time.
- */
-#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
-typedef uint32_t systime_t;
-#else
-typedef uint16_t systime_t;
-#endif
-
 /**
  * @brief   Type of stack and memory alignment enforcement.
  */
diff --git a/readme.txt b/readme.txt
index ce52352fc..d3766d795 100644
--- a/readme.txt
+++ b/readme.txt
@@ -77,6 +77,7 @@
 - NEW: Added an initialization function to the lwIP bindings, now it is
        sufficient to call lwipInit(NULL); in order to start the subsystem.
        Demo updated.
+- NIL: Fixed nilrtos redefinition of systime_t (bug #611).
 - HAL: Fixed TIM2 wrongly classified as 32bits in STM32F1xx devices
        (bug #610).