From 382d98e03ce40aaad1cbd19a515ed4391a76342c Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Tue, 19 Feb 2008 01:41:26 +0100 Subject: [PATCH] --- yaml --- r: 85783 b: refs/heads/master c: 84f7e451e9213d8c328752d0f39bc362519d53d2 h: refs/heads/master i: 85781: 3d96723e987df70739ba16b1d589d222e4578ea9 85779: 7f4d526dd46a0482b2b24dd506328181580ca309 85775: f456e7444e3c697d40ed10dbba7b07593961e8ed v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/via82cxxx.c | 1 + trunk/include/linux/pci_ids.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 75c6493c86a4..b38b569d24f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d684b21f89b96af3adc06877f29fd9f5214b23c8 +refs/heads/master: 84f7e451e9213d8c328752d0f39bc362519d53d2 diff --git a/trunk/drivers/ide/pci/via82cxxx.c b/trunk/drivers/ide/pci/via82cxxx.c index f3f79f805813..9004e7521889 100644 --- a/trunk/drivers/ide/pci/via82cxxx.c +++ b/trunk/drivers/ide/pci/via82cxxx.c @@ -479,6 +479,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i static const struct pci_device_id via_pci_tbl[] = { { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1), 0 }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C586_1), 0 }, + { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_CX700_IDE), 0 }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_6410), 1 }, { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), 1 }, { 0, }, diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index df6dd79a0d3b..0519e53d5eb2 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -1351,6 +1351,7 @@ #define PCI_DEVICE_ID_VIA_8231_4 0x8235 #define PCI_DEVICE_ID_VIA_8365_1 0x8305 #define PCI_DEVICE_ID_VIA_CX700 0x8324 +#define PCI_DEVICE_ID_VIA_CX700_IDE 0x0581 #define PCI_DEVICE_ID_VIA_VX800 0x8353 #define PCI_DEVICE_ID_VIA_8371_1 0x8391 #define PCI_DEVICE_ID_VIA_82C598_1 0x8598