The following commit has been merged in the linux branch: commit f38e35b43f2924b3b4e51147b7193f32e9276db4 Author: JosephChan@via.com.tw JosephChan@via.com.tw Date: Mon Nov 2 19:36:08 2009 +0800

sata_via: Remove redundant device ID for VIA VT8261

Just remove redundant device ID for VIA VT8261. The device ID 0x9000 and 0x9040 are redundant (for VT8261). The 0x9040 is reserved for other usage.

Signed-off-by: Joseph Chan josephchan@via.com.tw Signed-off-by: Jeff Garzik jgarzik@redhat.com

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index bdd43c7..02efd9a 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c @@ -93,7 +93,6 @@ static const struct pci_device_id svia_pci_tbl[] = { { PCI_VDEVICE(VIA, 0x7372), vt6420 }, { PCI_VDEVICE(VIA, 0x5287), vt8251 }, /* 2 sata chnls (Master/Slave) */ { PCI_VDEVICE(VIA, 0x9000), vt8251 }, - { PCI_VDEVICE(VIA, 0x9040), vt8251 },

{ } /* terminate list */ };