Merge branch 'master' into for-next

[cascardo/linux.git] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7b02aa5..072fe8c 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -458,7 +458,7 @@ enum {
        IDE_DFLAG_DOORLOCKING           = (1 << 15),
        /* disallow DMA */
        IDE_DFLAG_NODMA                 = (1 << 16),
-       /* powermanagment told us not to do anything, so sleep nicely */
+       /* powermanagement told us not to do anything, so sleep nicely */
        IDE_DFLAG_BLOCKED               = (1 << 17),
        /* sleeping & sleep field valid */
        IDE_DFLAG_SLEEPING              = (1 << 18),