diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-18 12:23:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-18 12:23:59 +0000 |
| commit | a7a850dba82498a1e050d8d153cae67ce0edb3b2 (patch) | |
| tree | f2b50444022ad27f407e087a820ae5ff248e0492 /arch/arm/mach-omap1 | |
| parent | c5fd9e77be44360b4827069c59f524815517917b (diff) | |
| parent | 0f4967bc21de0bb9e107f9ad3ced852daf66acd2 (diff) | |
| download | linux-0-day-a7a850dba82498a1e050d8d153cae67ce0edb3b2.tar.gz linux-0-day-a7a850dba82498a1e050d8d153cae67ce0edb3b2.tar.xz | |
Merge branch 'asoc-4.21' into asoc-next
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index e8ccf51c6f292..a7e9c6d19fb58 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -8,7 +8,7 @@ obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \ serial.o devices.o dma.o fb.o obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o -ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) +ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),) obj-y += mcbsp.o endif |