5 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c
index 28cf36967977..506a5e5a9ad5 100644
--- a/arch/arm/mach-sa1100/jornada720_ssp.c
+++ b/arch/arm/mach-sa1100/jornada720_ssp.c
@@ -54,7 +54,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse);
  * timeout after <timeout> rounds. Needs mcu running before its called.
  *
  * returns : %mcu output on success
- *         : %-ETIMEOUT on timeout
+ *         : %-ETIMEDOUT on timeout
  */
 int jornada_ssp_byte(u8 byte)
 {
@@ -82,7 +82,7 @@ EXPORT_SYMBOL(jornada_ssp_byte);
  * jornada_ssp_inout - decide if input is command or trading byte
  *
  * returns : (jornada_ssp_byte(byte)) on success
- *         : %-ETIMEOUT on timeout failure
+ *         : %-ETIMEDOUT on timeout failure
  */
 int jornada_ssp_inout(u8 byte)
 {
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index c92ced247947..1fd5ecb24425 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3174,7 +3174,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
 
         if (value & RST_FO_FR) {
                 QPRINTK(qdev, IFDOWN, ERR,
-                        "ETIMEOUT!!! errored out of resetting the chip!\n");
+                        "ETIMEDOUT!!! errored out of resetting the chip!\n");
                 status = -ETIMEDOUT;
         }
 
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f3a2fce6166c..47f68cfa7e21 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -398,7 +398,7 @@ static void rx_complete (struct urb *urb)
 
         /* stalls need manual reset. this is rare ... except that
          * when going through USB 2.0 TTs, unplug appears this way.
-         * we avoid the highspeed version of the ETIMEOUT/EILSEQ
+         * we avoid the highspeed version of the ETIMEDOUT/EILSEQ
          * storm, recovering as needed.
          */
         case -EPIPE:
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 888198c9a106..824e65bdc433 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -2424,7 +2424,7 @@ int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len)
 *       0               success
 *       >0              f/w reported error - f/w status code
 *       <0              driver reported error
-*       -ETIMEOUT       timout waiting for the cmd regs to become
+*       -ETIMEDOUT      timout waiting for the cmd regs to become
 *                       available, or waiting for the control reg
 *                       to indicate the Aux port is enabled.
 *       -ENODATA        the buffer does NOT contain a valid PDA.
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 820c5af44f3e..fcd107a78c5a 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -902,7 +902,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
  * Returns:
  *  0           on success
  * -EINTR       when interrupted by a signal
- * -ETIMEOUT    when the timeout expired
+ * -ETIMEDOUT   when the timeout expired
  * -EDEADLK     when the lock would deadlock (when deadlock detection is on)
  */
 int