aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
author <greg@echidna.(none)>2005-09-05 09:20:31 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 09:20:31 -0700
commit4e0c64cfc1126a2946487d4771168458bb9ba9be (patch)
tree1825887c36f029ca795561cc428fd6a2585cb5fa /include/linux
parentfae91e72b79ba9a21f0ce7551a1fd7e8984c85a6 (diff)
parent67d2c36e901403bb97cb79ddb44d702c3284d0ba (diff)
Merge HEAD from gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/libata.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index fc05a989928..022105c745f 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);