Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[mv-sheeva.git] / drivers / ata / libata-core.c

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 0a6a943b3779ec700af7f7bb5a30f220f0c1ab4d..d4e52e2148593e9fddde5884586683fc5ab14242 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2240,7 +2240,7 @@ int ata_dev_configure(struct ata_device *dev)
                        if (id[ATA_ID_CFA_KEY_MGMT] & 1)
                                ata_dev_printk(dev, KERN_WARNING,
                                               "supports DRM functions and may "
-                                              "not be fully accessable.\n");
+                                              "not be fully accessible.\n");
                        snprintf(revbuf, 7, "CFA");
                } else {
                        snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id));
@@ -2248,7 +2248,7 @@ int ata_dev_configure(struct ata_device *dev)
                        if (ata_id_has_tpm(id))
                                ata_dev_printk(dev, KERN_WARNING,
                                               "supports DRM functions and may "
-                                              "not be fully accessable.\n");
+                                              "not be fully accessible.\n");
                }
 
                dev->n_sectors = ata_id_n_sectors(id);
@@ -4138,6 +4138,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         * device and controller are SATA.
         */
        { "PIONEER DVD-RW  DVRTD08",    "1.00", ATA_HORKAGE_NOSETXFER },
+       { "PIONEER DVD-RW  DVR-212D",   "1.28", ATA_HORKAGE_NOSETXFER },
 
        /* End Marker */
        { }