diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:04:13 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:04:13 +0300 |
| commit | 5cc619db5c34146ee821acd08382b9d78579b52e (patch) | |
| tree | ee28e3cefdb35d56e33887f05db0a50589aa5883 /drivers/media/platform/Makefile | |
| parent | 83fd5ddc19931d5a5b884c43ee3c9d69c673bc96 (diff) | |
| parent | 287b8e11972f934052f4ed0751df465a5e84b69c (diff) | |
| download | linux-5cc619db5c34146ee821acd08382b9d78579b52e.tar.xz | |
Merge branch 'for-4.15/alps' into for-linus
- New ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook Stduio
and HP Elite book x360) support from Masaki Ota
Diffstat (limited to 'drivers/media/platform/Makefile')
| -rw-r--r-- | drivers/media/platform/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 9beadc760467..c1ef946bf032 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -85,4 +85,8 @@ obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp/ obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk-jpeg/ +obj-$(CONFIG_VIDEO_QCOM_CAMSS) += qcom/camss-8x16/ + obj-$(CONFIG_VIDEO_QCOM_VENUS) += qcom/venus/ + +obj-y += meson/ |