Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 0a368547e633..e6cf096498be 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -81,7 +81,6 @@ struct slot {
         struct hpc_ops *hpc_ops;
         struct hotplug_slot *hotplug_slot;
         struct list_head        slot_list;
-        unsigned long last_emi_toggle;
         struct delayed_work work;       /* work for button event */
         struct mutex lock;
 };
@@ -203,8 +202,6 @@ struct hpc_ops {
         int (*set_attention_status)(struct slot *slot, u8 status);
         int (*get_latch_status)(struct slot *slot, u8 *status);
         int (*get_adapter_status)(struct slot *slot, u8 *status);
-        int (*get_emi_status)(struct slot *slot, u8 *status);
-        int (*toggle_emi)(struct slot *slot);
         int (*get_max_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
         int (*get_cur_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
         int (*get_max_lnk_width)(struct slot *slot, enum pcie_link_width *val);