/spare/repo/libata-dev branch 'iomap-try3'

diff --combined drivers/scsi/libata-core.c
index d824938d05c90829de7ae932613ed53ccd8c2e0b,1fe20f76fb506e2824f3a64bc0c3f0fd417fd217..9fb9814525a35781a8d9086d701e6bd28012b48b
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -75,10 -75,6 +75,10 @@@ static void __ata_qc_complete(struct at
  static unsigned int ata_unique_id = 1;
  static struct workqueue_struct *ata_wq;
  
 +int atapi_enabled = 0;
 +module_param(atapi_enabled, int, 0444);
 +MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
 +
  MODULE_AUTHOR("Jeff Garzik");
  MODULE_DESCRIPTION("Library module for ATA devices");
  MODULE_LICENSE("GPL");
@@@ -4204,6 -4200,15 +4204,15 @@@ ata_probe_ent_alloc(struct device *dev
  
  
  
+ #ifdef CONFIG_PCI
+ 
+ void ata_pci_host_stop (struct ata_host_set *host_set)
+ {
+       struct pci_dev *pdev = to_pci_dev(host_set->dev);
+ 
+       pci_iounmap(pdev, host_set->mmio_base);
+ }
+ 
  /**
   *    ata_pci_init_native_mode - Initialize native-mode driver
   *    @pdev:  pci device to be initialized
@@@ -4216,7 -4221,6 +4225,6 @@@
   *    ata_probe_ent structure should then be freed with kfree().
   */
  
- #ifdef CONFIG_PCI
  struct ata_probe_ent *
  ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port)
  {
@@@ -4599,6 -4603,7 +4607,7 @@@ EXPORT_SYMBOL_GPL(ata_scsi_simulate)
  
  #ifdef CONFIG_PCI
  EXPORT_SYMBOL_GPL(pci_test_config_bits);
+ EXPORT_SYMBOL_GPL(ata_pci_host_stop);
  EXPORT_SYMBOL_GPL(ata_pci_init_native_mode);
  EXPORT_SYMBOL_GPL(ata_pci_init_one);
  EXPORT_SYMBOL_GPL(ata_pci_remove_one);

diff --combined include/linux/libata.h
index 1eaba4077e15a7f5c3cdca1b1de764162ba3de01,bd0f79dfb9cd5d1ff2e52d8d6cbaaf5357a72b32..022105c745fcca5cf9de0322f7dc9b69fe3940a4
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -40,6 -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 */
@@@ -449,6 -450,7 +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);