Merge HEAD from gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index fc05a9899288..022105c745fc 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);