Merge pull request #1444 from MilhouseVH/fix_slice_patch

linux: Fix slice patch - needed rebase
This commit is contained in:
Lukas Rusak 2017-03-14 13:55:32 -07:00 committed by GitHub
commit 9ef720f555

View File

@ -1,15 +1,15 @@
--- a/sound/soc/bcm/Makefile 2016-10-24 08:57:16.805712924 +0100
+++ b/sound/soc/bcm/Makefile 2016-10-24 08:59:51.541235893 +0100
@@ -26,6 +26,7 @@ snd-soc-digidac1-soundcard-objs := digid
snd-soc-dionaudio-loco-objs := dionaudio_loco.o
snd-soc-allo-piano-dac-objs := allo-piano-dac.o
snd-soc-pisound-objs := pisound.o
snd-soc-fe-pi-audio-objs := fe-pi-audio.o
+snd-soc-slice-objs := slice.o
obj-$(CONFIG_SND_BCM2708_SOC_ADAU1977_ADC) += snd-soc-adau1977-adc.o
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
@@ -44,3 +45,4 @@ obj-$(CONFIG_SND_DIGIDAC1_SOUNDCARD) +=
obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO) += snd-soc-dionaudio-loco.o
@@ -44,3 +45,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) +=
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
+obj-$(CONFIG_SND_BCM2708_SOC_SLICE) += snd-soc-slice.o