Here's a fix for my commit. Sorry again.
ALSA: emu10k1: fix faulty commit 18c7109289625106cdc810b20b628cd13b46d6dd
Commit 18c7109289625106cdc810b20b628cd13b46d6dd had #endif leftoff from
compilation. This patch fixes it.
Also, I replaced a misplaced comment by a useful one, that explains why are
here #ifdef and #endif added in compilation.
Signed-off-by: Vedran Miletic <rivanvx@xxxxxxxxx>
2008/10/21 Takashi Iwai <tiwai@xxxxxxx>:
> At Tue, 21 Oct 2008 11:00:11 +0200,
> =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:
>>
>> First part. Please checkin this if possible, and then I will send you
>> the second part (coding style fixes).
>>
>> ALSA: emu10k1: fix device names for Live!/Audigy1/2/4/E-mu
>>
>> Changelog:
>> * added missing SBxxxx, CTxxxx, PCxxx and MAEMxxxx where they were missing,
>> and fixed some of them which were wrong (according to kx.inf, which is pretty
>> accurate compared to anything out there)
>> * fixed device names to make them more consistent across various cards
>> * fixed order of devices where appropriate
>>
>> Signed-off-by: Vedran Miletic <rivanvx@xxxxxxxxx>
>
> Thanks, applied now (with a slight coding-style fix).
>
>
> Takashi
>
--
Vedran Miletić
ALSA: emu10k1: fix faulty commit 18c7109289625106cdc810b20b628cd13b46d6dd
Commit 18c7109289625106cdc810b20b628cd13b46d6dd had #endif leftoff from
compilation. This patch fixes it.
Also, I replaced a misplaced comment by a useful one, that explains why are
here #ifdef and #endif added in compilation.
Signed-off-by: Vedran Miletic <rivanvx@xxxxxxxxx>
---
sound/pci/emu10k1/emu10k1_main.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 423aa0d..0d7466b 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1439,8 +1439,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
.ca0102_chip = 1,
.spk71 = 1,
.emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
-#endif
- /* Audigy4 (Not PRO) SB0610 */
+ /* Note that all E-mu cards require kernel 2.6 or newer. */
{.vendor = 0x1102, .device = 0x0008,
.driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
.id = "Audigy2",
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
