diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 22:05:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 22:05:48 -0500 |
| commit | b297d520b9af536d5580ac505dd316be4cf5560c (patch) | |
| tree | a8f292b308c166ebd383b73fa09538775352c874 /drivers/base/Makefile | |
| parent | c773633916c66f8362ca01983d97bd33e35b743f (diff) | |
| parent | e34f44b3517fe545f7fd45a8c2f6ee1e5e4432d3 (diff) | |
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/Makefile | 2 |
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 \ | |||
| 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 |