projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'sound/for-next'
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
Makefile
diff --git
a/drivers/media/platform/Makefile
b/drivers/media/platform/Makefile
index c645a50bea5efca56519e9b3f057d5ca0a018370..40b18d12726ec52d0acfd15894337366eb420e89 100644
(file)
--- a/
drivers/media/platform/Makefile
+++ b/
drivers/media/platform/Makefile
@@
-9,7
+9,7
@@
obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/
-obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
soc_camera/soc_mediabus.o
+obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
This page took
0.044029 seconds
and
5
git commands to generate.