diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:38:09 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:38:09 -0700 |
| commit | 95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58 (patch) | |
| tree | eed1998bf14a6193c3f1ccd9b2b638fba6f69088 /drivers/media/platform/vimc/Makefile | |
| parent | 1dbc080c9ef6bcfba652ef0d6ae919b8c7c85a1d (diff) | |
| parent | a205425658dead19bb1b8ac00584aed98e60dde2 (diff) | |
Merge tag 'ib-mfd-many-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next
Merge "Immutable branch between MFD and many other subsystems due for
the v4.14 merge window" to get the TWL headers moved to the right place.
Diffstat (limited to 'drivers/media/platform/vimc/Makefile')
| -rw-r--r-- | drivers/media/platform/vimc/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/platform/vimc/Makefile b/drivers/media/platform/vimc/Makefile index c45195e5e05c..68c5d9804c11 100644 --- a/drivers/media/platform/vimc/Makefile +++ b/drivers/media/platform/vimc/Makefile @@ -1,3 +1,9 @@ -vimc-objs := vimc-core.o vimc-capture.o vimc-sensor.o +vimc-objs := vimc-core.o +vimc_capture-objs := vimc-capture.o +vimc_common-objs := vimc-common.o +vimc_debayer-objs := vimc-debayer.o +vimc_scaler-objs := vimc-scaler.o +vimc_sensor-objs := vimc-sensor.o -obj-$(CONFIG_VIDEO_VIMC) += vimc.o +obj-$(CONFIG_VIDEO_VIMC) += vimc.o vimc_capture.o vimc_common.o vimc-debayer.o \ + vimc_scaler.o vimc_sensor.o |