summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-12-03 11:57:48 -0500
committerMatthew Wilcox <matthew@wil.cx>2007-12-04 10:39:54 -0500
commit141e9d4b5492499c4735d764b599c21e83dac154 (patch)
tree6f18a6c1c73f7c62412a3cd17191cd6c75652d60
parent09b56adc98e0f8a21644fcb4d20ad367c3fceb55 (diff)
downloadlinux-3.10-141e9d4b5492499c4735d764b599c21e83dac154.tar.gz
linux-3.10-141e9d4b5492499c4735d764b599c21e83dac154.tar.bz2
linux-3.10-141e9d4b5492499c4735d764b599c21e83dac154.zip
Move dmapool.c to mm/ directory
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
-rw-r--r--drivers/base/Makefile2
-rw-r--r--mm/Makefile1
-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 b39ea3f59c9..ed0a722c38c 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -5,7 +5,7 @@ obj-y := core.o sys.o bus.o dd.o \
cpu.o firmware.o init.o map.o devres.o \
attribute_container.o transport_class.o
obj-y += power/
-obj-$(CONFIG_HAS_DMA) += dma-mapping.o dmapool.o
+obj-$(CONFIG_HAS_DMA) += dma-mapping.o
obj-$(CONFIG_ISA) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o
diff --git a/mm/Makefile b/mm/Makefile
index 5c0b0ea7572..e222cc5a79c 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -15,6 +15,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
obj-$(CONFIG_BOUNCE) += bounce.o
obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o
+obj-$(CONFIG_HAS_DMA) += dmapool.o
obj-$(CONFIG_HUGETLBFS) += hugetlb.o
obj-$(CONFIG_NUMA) += mempolicy.o
obj-$(CONFIG_SPARSEMEM) += sparse.o
diff --git a/drivers/base/dmapool.c b/mm/dmapool.c
index b5034dc72a0..b5034dc72a0 100644
--- a/drivers/base/dmapool.c
+++ b/mm/dmapool.c