From: Jeff Garzik Date: Thu, 24 Aug 2006 06:51:38 +0000 (-0400) Subject: Merge branch 'upstream-fixes' into upstream X-Git-Tag: v2.6.19-rc1~1262^2~20 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' into upstream --- 54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a diff --cc drivers/ata/sata_via.c index 6529189a288,01d40369a8a..a0699a1728d --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c @@@ -74,9 -74,9 +74,10 @@@ enum static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg); static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); + static void vt6420_error_handler(struct ata_port *ap); static const struct pci_device_id svia_pci_tbl[] = { + { 0x1106, 0x0591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 }, { 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 }, { 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },