diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /drivers/ata/pata_scc.c | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/ata/pata_scc.c')
| -rw-r--r-- | drivers/ata/pata_scc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index d9db3f8d60ef..fe36966f7e34 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c | |||
| @@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = { | |||
| 168 | }; | 168 | }; |
| 169 | 169 | ||
| 170 | static const struct pci_device_id scc_pci_tbl[] = { | 170 | static const struct pci_device_id scc_pci_tbl[] = { |
| 171 | {PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA, | 171 | { PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0}, |
| 172 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
| 173 | { } /* terminate list */ | 172 | { } /* terminate list */ |
| 174 | }; | 173 | }; |
| 175 | 174 | ||