diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-06-04 11:41:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-06-04 11:42:27 +0200 |
| commit | cdbc653a04ee692a7105a96e8dd6055d9971d45c (patch) | |
| tree | c1282680b3115edfd693a27bc6758208534ac557 /sound/Makefile | |
| parent | 009f8c90f571d87855914dbc20e6c0ea2a3b19ae (diff) | |
| parent | ceec4684085a9e4dc60439d84ab47ce260444804 (diff) | |
| download | linux-cdbc653a04ee692a7105a96e8dd6055d9971d45c.tar.bz2 | |
Merge branch 'for-next' into for-linus
4.18-rc1 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/Makefile')
| -rw-r--r-- | sound/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/Makefile b/sound/Makefile index 99d8c31262c8..797ecdcd35e2 100644 --- a/sound/Makefile +++ b/sound/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_SOUND) += soundcore.o obj-$(CONFIG_DMASOUND) += oss/dmasound/ obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \ - firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/ + firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/ xen/ obj-$(CONFIG_SND_AOA) += aoa/ # This one must be compilable even if sound is configured out |