projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
drivers
/
gpu
/
ipu-v3
/
Makefile
diff --git
a/drivers/gpu/ipu-v3/Makefile
b/drivers/gpu/ipu-v3/Makefile
index 1887972b4ac299b3a40c6669d2e22fb6b5d1646b..0b42836caae1eb1b5a6d8cc26120279f3f2fc234 100644
(file)
--- a/
drivers/gpu/ipu-v3/Makefile
+++ b/
drivers/gpu/ipu-v3/Makefile
@@
-1,3
+1,4
@@
obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o
-imx-ipu-v3-objs := ipu-common.o ipu-dc.o ipu-di.o ipu-dp.o ipu-dmfc.o ipu-smfc.o
+imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-dc.o ipu-di.o \
+ ipu-dp.o ipu-dmfc.o ipu-smfc.o