diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-25 12:24:22 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-25 12:25:09 +0200 |
| commit | 188af63c0af2d7ef395bc94e3efa173f34dae03d (patch) | |
| tree | c2648c26ac37b836140ad499e0f5c0eec5586f5f /drivers/media/platform/s5p-mfc | |
| parent | [media] uvc: Depend on VIDEO_V4L2 (diff) | |
| parent | [media] Fix build when drivers are builtin and frontend modules (diff) | |
| download | linux-188af63c0af2d7ef395bc94e3efa173f34dae03d.tar.xz linux-188af63c0af2d7ef395bc94e3efa173f34dae03d.zip | |
Merge branch 'v4l_for_linus' into patchwork
* v4l_for_linus:
[media] Fix build when drivers are builtin and frontend modules
[media] s5p makefiles: don't override other selections on obj-[ym]
[media] exynos4-is: Fix FIMC-IS clocks initialization
[media] rtl28xxu: fix buffer overflow when probing Rafael Micro r820t tuner
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/s5p-mfc/Makefile index 379008c6d09a..15f59b324fef 100644 --- a/drivers/media/platform/s5p-mfc/Makefile +++ b/drivers/media/platform/s5p-mfc/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) := s5p-mfc.o +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc.o s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o s5p-mfc-y += s5p_mfc_dec.o s5p_mfc_enc.o s5p-mfc-y += s5p_mfc_ctrl.o s5p_mfc_pm.o |