Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / usb / host / fhci.h

diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 71c3caa..dc6939a 100644 (file)
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -82,7 +82,7 @@
 #define USB_TD_RX_ER_NONOCT    0x40000000 /* Tx Non Octet Aligned Packet */
 #define USB_TD_RX_ER_BITSTUFF  0x20000000 /* Frame Aborted-Received pkt */
 #define USB_TD_RX_ER_CRC       0x10000000 /* CRC error */
-#define USB_TD_RX_ER_OVERUN    0x08000000 /* Over - run occured */
+#define USB_TD_RX_ER_OVERUN    0x08000000 /* Over - run occurred */
 #define USB_TD_RX_ER_PID       0x04000000 /* wrong PID received */
 #define USB_TD_RX_DATA_UNDERUN 0x02000000 /* shorter than expected */
 #define USB_TD_RX_DATA_OVERUN  0x01000000 /* longer than expected */
@@ -363,7 +363,7 @@ struct ed {
 struct td {
        void *data;              /* a pointer to the data buffer */
        unsigned int len;        /* length of the data to be submitted */
-       unsigned int actual_len; /* actual bytes transfered on this td */
+       unsigned int actual_len; /* actual bytes transferred on this td */
        enum fhci_ta_type type;  /* transaction type */
        u8 toggle;               /* toggle for next trans. within this TD */
        u16 iso_index;           /* ISO transaction index */