diff options
-rw-r--r-- | drivers/base/Makefile | 2 | ||||
-rw-r--r-- | mm/Makefile | 1 | ||||
-rw-r--r-- | mm/dmapool.c (renamed from drivers/base/dmapool.c) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index b39ea3f59c9b..ed0a722c38ca 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile | |||
@@ -5,7 +5,7 @@ obj-y := core.o sys.o bus.o dd.o \ | |||
5 | cpu.o firmware.o init.o map.o devres.o \ | 5 | cpu.o firmware.o init.o map.o devres.o \ |
6 | attribute_container.o transport_class.o | 6 | attribute_container.o transport_class.o |
7 | obj-y += power/ | 7 | obj-y += power/ |
8 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o dmapool.o | 8 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o |
9 | obj-$(CONFIG_ISA) += isa.o | 9 | obj-$(CONFIG_ISA) += isa.o |
10 | obj-$(CONFIG_FW_LOADER) += firmware_class.o | 10 | obj-$(CONFIG_FW_LOADER) += firmware_class.o |
11 | obj-$(CONFIG_NUMA) += node.o | 11 | obj-$(CONFIG_NUMA) += node.o |
diff --git a/mm/Makefile b/mm/Makefile index 5c0b0ea7572d..e222cc5a79cd 100644 --- a/mm/Makefile +++ b/mm/Makefile | |||
@@ -15,6 +15,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ | |||
15 | 15 | ||
16 | obj-$(CONFIG_BOUNCE) += bounce.o | 16 | obj-$(CONFIG_BOUNCE) += bounce.o |
17 | obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o | 17 | obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o |
18 | obj-$(CONFIG_HAS_DMA) += dmapool.o | ||
18 | obj-$(CONFIG_HUGETLBFS) += hugetlb.o | 19 | obj-$(CONFIG_HUGETLBFS) += hugetlb.o |
19 | obj-$(CONFIG_NUMA) += mempolicy.o | 20 | obj-$(CONFIG_NUMA) += mempolicy.o |
20 | obj-$(CONFIG_SPARSEMEM) += sparse.o | 21 | obj-$(CONFIG_SPARSEMEM) += sparse.o |
diff --git a/drivers/base/dmapool.c b/mm/dmapool.c index b5034dc72a05..b5034dc72a05 100644 --- a/drivers/base/dmapool.c +++ b/mm/dmapool.c | |||