diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-11 10:33:12 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-11 10:33:12 +0300 |
| commit | 3d2f4d0c0d4f3b676ecca504a3916b8e9843a181 (patch) | |
| tree | f72e05df59734bb1deeba510283072e16c056640 /sound/soc/generic/Makefile | |
| parent | 09da111aef57c022ac28bb8974f41c1729102d11 (diff) | |
| parent | 3f640970a41429f0a076c01270bbd014c9eae61c (diff) | |
| download | linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge from for-linus just to make the further development easier.
Diffstat (limited to 'sound/soc/generic/Makefile')
| -rw-r--r-- | sound/soc/generic/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index 45602ca8536e..2d53c8d70705 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -1,5 +1,5 @@ -obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) := simple-card-utils.o - +snd-soc-simple-card-utils-objs := simple-card-utils.o snd-soc-simple-card-objs := simple-card.o -obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o +obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o +obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o |