summaryrefslogtreecommitdiffstats
path: root/drivers/base/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 04:05:48 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 04:05:48 +0100
commitb297d520b9af536d5580ac505dd316be4cf5560c (patch)
treea8f292b308c166ebd383b73fa09538775352c874 /drivers/base/Makefile
parentdeprecate smbfs in favour of cifs (diff)
parentpool: Improve memory usage for devices which can't cross boundaries (diff)
downloadlinux-b297d520b9af536d5580ac505dd316be4cf5560c.tar.xz
linux-b297d520b9af536d5580ac505dd316be4cf5560c.zip
Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc: pool: Improve memory usage for devices which can't cross boundaries Change dmapool free block management dmapool: Tidy up includes and add comments dmapool: Validate parameters to dma_pool_create Avoid taking waitqueue lock in dmapool dmapool: Fix style problems Move dmapool.c to mm/ directory
Diffstat (limited to 'drivers/base/Makefile')
-rw-r--r--drivers/base/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 63e09c015ca0..c66637392bbc 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