diff options
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/Makefile | 10 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 1 | ||||
-rw-r--r-- | sound/pci/emu10k1/emupcm.c | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile index cf2d5636d8be..fc5591e7777e 100644 --- a/sound/pci/emu10k1/Makefile +++ b/sound/pci/emu10k1/Makefile | |||
@@ -9,15 +9,7 @@ snd-emu10k1-objs := emu10k1.o emu10k1_main.o \ | |||
9 | snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o | 9 | snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o |
10 | snd-emu10k1x-objs := emu10k1x.o | 10 | snd-emu10k1x-objs := emu10k1x.o |
11 | 11 | ||
12 | # | ||
13 | # this function returns: | ||
14 | # "m" - CONFIG_SND_SEQUENCER is m | ||
15 | # <empty string> - CONFIG_SND_SEQUENCER is undefined | ||
16 | # otherwise parameter #1 value | ||
17 | # | ||
18 | sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) | ||
19 | |||
20 | # Toplevel Module Dependency | 12 | # Toplevel Module Dependency |
21 | obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o | 13 | obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o |
22 | obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emu10k1-synth.o | 14 | obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emu10k1-synth.o |
23 | obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o | 15 | obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 1970f0e70f37..4d3ad793e98f 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -858,7 +858,6 @@ static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct s | |||
858 | } | 858 | } |
859 | 859 | ||
860 | pcm->info_flags = 0; | 860 | pcm->info_flags = 0; |
861 | pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; | ||
862 | switch(device) { | 861 | switch(device) { |
863 | case 0: | 862 | case 0: |
864 | strcpy(pcm->name, "EMU10K1X Front"); | 863 | strcpy(pcm->name, "EMU10K1X Front"); |
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 78f62fd404c2..55b83ef73c63 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c | |||
@@ -1736,7 +1736,7 @@ static struct snd_pcm_hardware snd_emu10k1_fx8010_playback = | |||
1736 | .buffer_bytes_max = (128*1024), | 1736 | .buffer_bytes_max = (128*1024), |
1737 | .period_bytes_min = 1024, | 1737 | .period_bytes_min = 1024, |
1738 | .period_bytes_max = (128*1024), | 1738 | .period_bytes_max = (128*1024), |
1739 | .periods_min = 1, | 1739 | .periods_min = 2, |
1740 | .periods_max = 1024, | 1740 | .periods_max = 1024, |
1741 | .fifo_size = 0, | 1741 | .fifo_size = 0, |
1742 | }; | 1742 | }; |