Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / usb / serial / opticon.c

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index f37476e..701452a 100644 (file)
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -115,7 +115,7 @@ static void opticon_bulk_callback(struct urb *urb)
                }
        } else {
                dev_dbg(&priv->udev->dev,
-                       "Improper ammount of data received from the device, "
+                       "Improper amount of data received from the device, "
                        "%d bytes", urb->actual_length);
        }