diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 03:38:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 03:38:43 +0200 |
| commit | ef5f5de069bd9081a7ddf6998269b58fc65e27ef (patch) | |
| tree | 21d53507543248f81725cbc486625f77562f935d /drivers/dma/Makefile | |
| parent | 73990fc810bf84c5338d9596f8af8d70fe90ac72 (diff) | |
| parent | e91a398c31cef2d51786642e372c503cd43fba90 (diff) | |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI / bus: Move duplicate code to a separate new function
mfd: Add support for Intel Sunrisepoint LPSS devices
dmaengine: add a driver for Intel integrated DMA 64-bit
mfd: make mfd_remove_devices() iterate in reverse order
driver core: implement device_for_each_child_reverse()
klist: implement klist_prev()
Driver core: wakeup the parent device before trying probe
ACPI / PM: Attach ACPI power domain only once
PM / QoS: Make it possible to expose device latency tolerance to userspace
ACPI / PM: Update the copyright notice and description of power.c
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 6a4d6f2827da..56ff8c705c00 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_HSU_DMA) += hsu/ obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ obj-$(CONFIG_MV_XOR) += mv_xor.o +obj-$(CONFIG_IDMA64) += idma64.o obj-$(CONFIG_DW_DMAC_CORE) += dw/ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o obj-$(CONFIG_AT_XDMAC) += at_xdmac.o |