diff options
author | NeilBrown <neilb@suse.de> | 2009-09-23 10:31:11 +0200 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-09-23 10:31:11 +0200 |
commit | 4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c (patch) | |
tree | 51a231742e211143f5845edf4b09d1712dcd2771 /arch/sh/drivers/dma/Makefile | |
parent | md: raid-1/10: fix RW bits manipulation (diff) | |
parent | async_tx/raid6: add missing dma_unmap calls to the async fail case (diff) | |
download | linux-4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c.tar.xz linux-4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into for-linus
Diffstat (limited to 'arch/sh/drivers/dma/Makefile')
-rw-r--r-- | arch/sh/drivers/dma/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile index c6068137b46f..d88c9484762c 100644 --- a/arch/sh/drivers/dma/Makefile +++ b/arch/sh/drivers/dma/Makefile @@ -2,8 +2,7 @@ # Makefile for the SuperH DMA specific kernel interface routines under Linux. # -obj-$(CONFIG_SH_DMA_API) += dma-api.o dma-sysfs.o -obj-$(CONFIG_SH_DMA) += dma-sh.o +obj-$(CONFIG_SH_DMA_API) += dma-sh.o dma-api.o dma-sysfs.o obj-$(CONFIG_PVR2_DMA) += dma-pvr2.o obj-$(CONFIG_G2_DMA) += dma-g2.o obj-$(CONFIG_SH_DMABRG) += dmabrg.o |