Merge branch 'topic/lola' into for-linus

[~andy/linux] / drivers / ide / via82cxxx.c

diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index 101f4002238601eb6be0048236df78f6ca667380..f46f49cfcc28a25aed707d0d57a69e87b93409b5 100644 (file)
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -14,7 +14,7 @@
  *     Andre Hedrick
  *
  * Documentation:
- *     Obsolete device documentation publically available from via.com.tw
+ *     Obsolete device documentation publicly available from via.com.tw
  *     Current device documentation available under NDA only
  */
 
@@ -79,7 +79,7 @@ static struct via_isa_bridge {
        { "vt8261",     PCI_DEVICE_ID_VIA_8261,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
-       { "vt6415",     PCI_DEVICE_ID_VIA_6410,     0x00, 0xff, ATA_UDMA6, VIA_BAD_AST },
+       { "vt6415",     PCI_DEVICE_ID_VIA_6415,     0x00, 0xff, ATA_UDMA6, VIA_BAD_AST },
        { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237",     PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237a",    PCI_DEVICE_ID_VIA_8237A,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },