Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[pandora-kernel.git] / drivers / ata / ahci.h

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index ccaf081..3986500 100644 (file)
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -225,7 +225,7 @@ enum {
        /* em_ctl bits */
        EM_CTL_RST              = (1 << 9), /* Reset */
        EM_CTL_TM               = (1 << 8), /* Transmit Message */
-       EM_CTL_MR               = (1 << 0), /* Message Recieved */
+       EM_CTL_MR               = (1 << 0), /* Message Received */
        EM_CTL_ALHD             = (1 << 26), /* Activity LED */
        EM_CTL_XMT              = (1 << 25), /* Transmit Only */
        EM_CTL_SMB              = (1 << 24), /* Single Message Buffer */
@@ -281,7 +281,7 @@ struct ahci_port_priv {
 };
 
 struct ahci_host_priv {
-       void __iomem *          mmio;           /* bus-independant mem map */
+       void __iomem *          mmio;           /* bus-independent mem map */
        unsigned int            flags;          /* AHCI_HFLAG_* */
        u32                     cap;            /* cap to use */
        u32                     cap2;           /* cap2 to use */