diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-09-21 11:53:30 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-21 11:53:30 +0530 |
| commit | 0745c9a5e3b64ee03784bc58ba5b127418d78b4e (patch) | |
| tree | 479961da88a62ad5e7a2cf8292be271b89fcd50d /arch/arm/plat-samsung/Makefile | |
| parent | f8de8f4ce2a83ccf7571ee13d41d02a9040797f9 (diff) | |
| parent | 51ddf31da16b1ab9da861eafedad6d263faf4388 (diff) | |
| download | blackbird-op-linux-0745c9a5e3b64ee03784bc58ba5b127418d78b4e.tar.gz blackbird-op-linux-0745c9a5e3b64ee03784bc58ba5b127418d78b4e.zip | |
Merge branch 'samsung_dma' into next
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 853764ba8cc5..90758494cad8 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -63,9 +63,9 @@ obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT) += dev-backlight.o # DMA support -obj-$(CONFIG_S3C_DMA) += dma.o +obj-$(CONFIG_S3C_DMA) += dma.o s3c-dma-ops.o -obj-$(CONFIG_S3C_PL330_DMA) += s3c-pl330.o +obj-$(CONFIG_SAMSUNG_DMADEV) += dma-ops.o # PM support |
