From f552f81763343d00e8df71a5cc26a1ff2ab52de0 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Thu, 6 Nov 2008 15:46:40 +0000
Subject: [PATCH] merge -c1582 branches/stable-1.4: Typo.

---
 NEWS             | 1 +
 master/fsm_coe.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 238fe3ae..54b7ed8a 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Changes since 1.4.0-rc3:
 * Fixed race condition concerning the ec_slave_config_state->operational flag.
 * Fixed wrong calculation of the expected working counter if the process data
   of a domain span several datagrams.
+* Fixed typo in logging output.
 
 Changes in 1.4.0-rc3:
 
diff --git a/master/fsm_coe.c b/master/fsm_coe.c
index e2634e10..7441bb27 100644
--- a/master/fsm_coe.c
+++ b/master/fsm_coe.c
@@ -1404,7 +1404,7 @@ void ec_fsm_coe_up_request(ec_fsm_coe_t *fsm /**< finite state machine */)
                 (jiffies - fsm->request->jiffies_sent) * 1000 / HZ;
             if (diff_ms < fsm->request->response_timeout) {
                 if (fsm->slave->master->debug_level) {
-                    EC_DBG("Slave %u did no respond to Sdo upload request. "
+                    EC_DBG("Slave %u did not respond to Sdo upload request. "
                             "Retrying after %u ms...\n",
                             slave->ring_position, (u32) diff_ms);
                 }