diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-10-18 07:46:47 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-12-13 20:49:34 +0300 |
| commit | ef5a14ba943983c245ae34eb81dd1717618934cd (patch) | |
| tree | 50c2c159ce550e1661033cad4b1257c885068c61 | |
| parent | 56c118a7331df1522811e672da1195f6a0f93c4f (diff) | |
| download | linux-ef5a14ba943983c245ae34eb81dd1717618934cd.tar.xz | |
ALSA: fireworks/bebob/oxfw/dice: enable to make as built-in
commit df4833886f91eea0d20e6e97066adab308625ef8 upstream.
When committed to upstream, these four modules had wrong entries for
Makefile. This forces them to be loadable modules even if they're set
as built-in.
This commit fixes this bug.
Fixes: b5b04336015e('ALSA: fireworks: Add skelton for Fireworks based devices')
Fixes: fd6f4b0dc167('ALSA: bebob: Add skelton for BeBoB based devices')
Fixes: 1a4e39c2e5ca('ALSA: oxfw: Move to its own directory')
Fixes: 14ff6a094815('ALSA: dice: Move file to its own directory')
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[ luis: backported to 3.16:
- dropped changes to oxfw and dice modules as they do not exist in
the 3.16 kernel ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | sound/firewire/bebob/Makefile | 2 | ||||
| -rw-r--r-- | sound/firewire/fireworks/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/bebob/Makefile b/sound/firewire/bebob/Makefile index 6cf470c80d1f..af7ed6643266 100644 --- a/sound/firewire/bebob/Makefile +++ b/sound/firewire/bebob/Makefile @@ -1,4 +1,4 @@ snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \ bebob_pcm.o bebob_hwdep.o bebob_terratec.o bebob_yamaha.o \ bebob_focusrite.o bebob_maudio.o bebob.o -obj-m += snd-bebob.o +obj-$(CONFIG_SND_BEBOB) += snd-bebob.o diff --git a/sound/firewire/fireworks/Makefile b/sound/firewire/fireworks/Makefile index 0c7440826db8..15ef7f75a8ef 100644 --- a/sound/firewire/fireworks/Makefile +++ b/sound/firewire/fireworks/Makefile @@ -1,4 +1,4 @@ snd-fireworks-objs := fireworks_transaction.o fireworks_command.o \ fireworks_stream.o fireworks_proc.o fireworks_midi.o \ fireworks_pcm.o fireworks_hwdep.o fireworks.o -obj-m += snd-fireworks.o +obj-$(CONFIG_SND_FIREWORKS) += snd-fireworks.o |