diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-20 05:46:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-20 05:46:00 -0300 |
| commit | 5f63adbb4cb9f952a8daee97f89c8811da5fd68a (patch) | |
| tree | aa92ee17ca2ea53c0208ff8271b2db936b1c4c43 | |
| parent | 722a860ecb29aa34ec6f7d7f32b949209e86a2f3 (diff) | |
| download | linux-5f63adbb4cb9f952a8daee97f89c8811da5fd68a.tar.gz linux-5f63adbb4cb9f952a8daee97f89c8811da5fd68a.tar.bz2 linux-5f63adbb4cb9f952a8daee97f89c8811da5fd68a.zip | |
[media] s5p makefiles: don't override other selections on obj-[ym]
The $obj-m/$obj-y vars should be adding new modules to build, not
overriding it. So, it should never use
$obj-y := foo.o
instead, it should use:
$obj-y += foo.o
Failing to do that is very bad, as it will suppress needed modules.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/platform/s5p-mfc/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/s5p-jpeg/Makefile index ddc2900d88a2..d18cb5edd2d5 100644 --- a/drivers/media/platform/s5p-jpeg/Makefile +++ b/drivers/media/platform/s5p-jpeg/Makefile @@ -1,2 +1,2 @@ s5p-jpeg-objs := jpeg-core.o -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) := s5p-jpeg.o +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg.o 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 |