diff options
| author | Takashi Iwai | 2017-11-13 15:43:04 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2017-11-13 15:43:13 +0100 |
| commit | c429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch) | |
| tree | 80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /sound/Makefile | |
| parent | ALSA: hda - fix headset mic problem for Dell machines with alc274 (diff) | |
| parent | ALSA: ice1712: define i2c eeprom addr to header file (diff) | |
| download | kernel-qcow2-linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.gz kernel-qcow2-linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.xz kernel-qcow2-linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.zip | |
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/Makefile')
| -rw-r--r-- | sound/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/Makefile b/sound/Makefile index 6de45d2c32f7..e5794fdd3d79 100644 --- a/sound/Makefile +++ b/sound/Makefile @@ -2,8 +2,7 @@ # obj-$(CONFIG_SOUND) += soundcore.o -obj-$(CONFIG_SOUND_PRIME) += oss/ -obj-$(CONFIG_DMASOUND) += oss/ +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/ obj-$(CONFIG_SND_AOA) += aoa/ |