diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 21:34:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 21:34:58 -0400 |
| commit | aa36c7bf987dfa5597c0f7c46f8fca46b2dd33d2 (patch) | |
| tree | ad9fe2294b45562b434bf7cf9e387624057bbd65 /drivers/ata/pata_sc1200.c | |
| parent | 9dda696f0de87a2e5cfabb147e28c76b7d3c6846 (diff) | |
| parent | 43c9c59185eec7caaff6e9dd8d4c93a4d9836a86 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: implement dump_id force param
libata: disable ATAPI AN by default
libata-sff: make BMDMA optional
libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf
libata-sff: separate out BMDMA init
libata-sff: separate out BMDMA irq handler
libata-sff: ata_sff_irq_clear() is BMDMA specific
sata_mv: drop unncessary EH callback resetting
Diffstat (limited to 'drivers/ata/pata_sc1200.c')
| -rw-r--r-- | drivers/ata/pata_sc1200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index 6b5b63a2fd8e..e2c18257adff 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
| @@ -237,7 +237,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 237 | }; | 237 | }; |
| 238 | const struct ata_port_info *ppi[] = { &info, NULL }; | 238 | const struct ata_port_info *ppi[] = { &info, NULL }; |
| 239 | 239 | ||
| 240 | return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL, 0); | 240 | return ata_pci_bmdma_init_one(dev, ppi, &sc1200_sht, NULL, 0); |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | static const struct pci_device_id sc1200[] = { | 243 | static const struct pci_device_id sc1200[] = { |