git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
Makefile
diff --git
a/arch/arm/plat-samsung/Makefile
b/arch/arm/plat-samsung/Makefile
index
09adb84
..
3dd5dba
100644
(file)
--- a/
arch/arm/plat-samsung/Makefile
+++ b/
arch/arm/plat-samsung/Makefile
@@
-62,9
+62,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_S
3C_PL330_DMA) += s3c-pl330
.o
+obj-$(CONFIG_S
AMSUNG_DMADEV) += dma-ops
.o
# PM support