diff options
| author | Alexander Graf <agraf@suse.de> | 2013-08-28 18:41:59 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-28 18:41:59 -0400 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /drivers/base/Makefile | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc (diff) | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 (diff) | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'drivers/base/Makefile')
| -rw-r--r-- | drivers/base/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 5d93bb519753..94e8a80e87f8 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile | |||
| @@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o | |||
| 10 | obj-y += power/ | 10 | obj-y += power/ |
| 11 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o | 11 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o |
| 12 | obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o | 12 | obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o |
| 13 | obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o | 13 | obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o reservation.o |
| 14 | obj-$(CONFIG_ISA) += isa.o | 14 | obj-$(CONFIG_ISA) += isa.o |
| 15 | obj-$(CONFIG_FW_LOADER) += firmware_class.o | 15 | obj-$(CONFIG_FW_LOADER) += firmware_class.o |
| 16 | obj-$(CONFIG_NUMA) += node.o | 16 | obj-$(CONFIG_NUMA) += node.o |