Re: [PATCH] ALSA 1.0.2c

From: Jaroslav Kysela
Date: Thu Feb 05 2004 - 13:54:37 EST


On Thu, 5 Feb 2004, Prakash K. Cheemplavam wrote:

> Jaroslav Kysela wrote:
> > Linus, please do a
> >
> > bk pull http://linux-sound.bkbits.net/linux-sound
> >
> > The GNU patch is available at:
> >
> > ftp://ftp.alsa-project.org/pub/kernel-patches/alsa-bk-2004-02-05.patch.gz
>
> Doesn't build for me:
>
> LD sound/parisc/built-in.o
> CC sound/pci/intel8x0.o
> sound/pci/intel8x0.c: In function `alsa_card_intel8x0_setup':
> sound/pci/intel8x0.c:2817: error: Syntaxfehler before "get_option"
> sound/pci/intel8x0.c:2824: error: Syntaxfehler before ')' token
> make[2]: *** [sound/pci/intel8x0.o] Fehler 1
> make[1]: *** [sound/pci] Fehler 2
> make: *** [sound] Fehler 2

Obvious copy bug:

Index: intel8x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- intel8x0.c 5 Feb 2004 13:28:42 -0000 1.112
+++ intel8x0.c 5 Feb 2004 18:48:04 -0000 1.113
@@ -2813,7 +2813,7 @@
(void)(get_option(&str,&enable[nr_dev]) == 2 &&
get_option(&str,&index[nr_dev]) == 2 &&
get_id(&str,&id[nr_dev]) == 2 &&
- get_option(&str,&ac97_clock[nr_dev]) == 2
+ get_option(&str,&ac97_clock[nr_dev]) == 2 &&
get_option(&str,&ac97_quirk[nr_dev]) == 2
#ifdef SUPPORT_MIDI
&& get_option(&str,&mpu_port[nr_dev]) == 2

Jaroslav

-----
Jaroslav Kysela <perex@xxxxxxx>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/