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 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
Makefile
diff --git
a/arch/arm/plat-samsung/Makefile
b/arch/arm/plat-samsung/Makefile
index
09dbd78
..
29932f8
100644
(file)
--- a/
arch/arm/plat-samsung/Makefile
+++ b/
arch/arm/plat-samsung/Makefile
@@
-17,6
+17,7
@@
obj-y += clock.o
obj-y += pwm-clock.o
obj-y += gpio.o
obj-y += gpio-config.o
+obj-y += dev-asocdma.o
obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT) += gpiolib.o
obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o