diff --git a/[refs] b/[refs] index 67924a5a7873..dea24a63be7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf2d401bca3681f5380f711be65f2026255cc166 +refs/heads/master: 3343571d9f88a0de542d33aea9ab881f00ff866d diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index d0a7ad5ed518..b03d5a340dc8 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -143,7 +143,7 @@ enum { ATA_DFLAG_CFG_MASK = (1 << 8) - 1, ATA_DFLAG_PIO = (1 << 8), /* device limited to PIO mode */ - ATA_DFLAG_NCQ_OFF = (1 << 9), /* devied limited to non-NCQ mode */ + ATA_DFLAG_NCQ_OFF = (1 << 9), /* device limited to non-NCQ mode */ ATA_DFLAG_SUSPENDED = (1 << 10), /* device suspended */ ATA_DFLAG_INIT_MASK = (1 << 16) - 1,