diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 00:59:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 00:59:53 -0500 |
| commit | 9fe02668fe48a1d546196bc1392330ff28d9bd57 (patch) | |
| tree | 8bfbfd3b9ffbad07d84c1ec2759523784d589ccc /drivers/ide/cs5535.c | |
| parent | 602da297e293eb2cbd28dcdbbe247593a46a853a (diff) | |
| parent | 10ca30285d5283ac88ba7ae94111f2e9fe59c232 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
Diffstat (limited to 'drivers/ide/cs5535.c')
| -rw-r--r-- | drivers/ide/cs5535.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c index 983d957a0189..b883838adc24 100644 --- a/drivers/ide/cs5535.c +++ b/drivers/ide/cs5535.c | |||
| @@ -187,6 +187,7 @@ static int __devinit cs5535_init_one(struct pci_dev *dev, | |||
| 187 | 187 | ||
| 188 | static const struct pci_device_id cs5535_pci_tbl[] = { | 188 | static const struct pci_device_id cs5535_pci_tbl[] = { |
| 189 | { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 }, | 189 | { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 }, |
| 190 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), }, | ||
| 190 | { 0, }, | 191 | { 0, }, |
| 191 | }; | 192 | }; |
| 192 | 193 | ||