diff options
| author | Vaibhav Agarwal <vaibhav.agarwal@linaro.org> | 2016-04-21 22:14:02 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-04-25 17:37:10 -0700 |
| commit | 2b8c2b51000e3d056f9aa27a64b93feabddf77a4 (patch) | |
| tree | dde18d1b295f4c8bcbcefa362bd128c9fe479be1 /drivers/staging/greybus/Makefile | |
| parent | dc0f0285f80558e800411d583de71358a581dfae (diff) | |
| download | linux-2b8c2b51000e3d056f9aa27a64b93feabddf77a4.tar.bz2 | |
greybus: audio: Changes in response to ASoC cleanup
Update Makefile in response to SND_SOC_DYNAMIC_DAILINK cflag
removal.
Update files for msm-dynamic-dailink.h header file removal.
Update in response to API name changes. Also, acquire sound card
controls_rwsem before adding kcontrols to avoid deadlock.
Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Reviewed-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/Makefile')
| -rw-r--r-- | drivers/staging/greybus/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile index 8ec607460ec0..5bdccccbe171 100644 --- a/drivers/staging/greybus/Makefile +++ b/drivers/staging/greybus/Makefile @@ -52,11 +52,9 @@ obj-m += gb-es2.o ifeq ($(CONFIG_USB_HSIC_USB3613),y) obj-m += gb-arche.o endif -ifeq ($(CONFIG_SND_SOC_DYNAMIC_DAILINK),y) - obj-m += gb-audio-codec.o -obj-m += gb-audio-module.o -endif ifeq ($(CONFIG_ARCH_MSM8994),y) + obj-m += gb-audio-codec.o + obj-m += gb-audio-module.o obj-m += gb-camera.o endif obj-m += gb-audio-gb.o |