diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 05:50:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 05:50:36 -0700 |
| commit | 94f8c66e5e543d79231abf203d6e514ecb668688 (patch) | |
| tree | 79f240cb13dd3da5879a7cf52ca1beca4650311d /include/linux | |
| parent | da1f136c26d45c57e8b2d711bf17a6e5ec4de2d1 (diff) | |
| parent | d0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (diff) | |
| download | op-kernel-dev-94f8c66e5e543d79231abf203d6e514ecb668688.zip op-kernel-dev-94f8c66e5e543d79231abf203d6e514ecb668688.tar.gz | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index fc05a98..022105c 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -40,7 +40,6 @@ #undef ATA_VERBOSE_DEBUG /* yet more debugging output */ #undef ATA_IRQ_TRAP /* define to ack screaming irqs */ #undef ATA_NDEBUG /* define to disable quick runtime checks */ -#undef ATA_ENABLE_ATAPI /* define to enable ATAPI support */ #undef ATA_ENABLE_PATA /* define to enable PATA support in some * low-level drivers */ #undef ATAPI_ENABLE_DMADIR /* enables ATAPI DMADIR bridge support */ @@ -450,6 +449,7 @@ struct pci_bits { unsigned long val; }; +extern void ata_pci_host_stop (struct ata_host_set *host_set); extern struct ata_probe_ent * ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port); extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits); |
