lkml.org 
[lkml]   [2000]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Re: sound in 2.4.0test8 (cs46xx.c)
Dan Aloni wrote:
>
> On Mon, 11 Sep 2000, Bernd Jucknischke wrote:
>
> > I've just tried to compile a 2.4.0-test8 on an IBM thinkpad T20 and got the
> > following error:
> >
> > cs46xx.c: 107: warning: `SND_DEV_DSP16' redefined
> > /usr/src/linux/include/sound.h: 12: warning: this is the location of the
> > previous definition
> > cs46xx.c: 2488: cards causes a section type conflict
> > cs46xx.c: 2630: warning: `cs_remove' defined but never used
> >
>
> I also saw this a few days ago.
> Linus'-not-Maxwell, please consider applying this patch.
>
> Dan Aloni (dax)
> karrde@callisto.yi.org
>
> --- linux/drivers/sound/cs46xx.c Tue Sep 5 11:47:16 2000
> +++ linux.vanilla/drivers/sound/cs46xx.c Wed Sep 6 12:26:02 2000
> @@ -2485,7 +2485,7 @@
> void (*active)(struct cs_card *, int);
> };
>
> -static struct cs_card_type __init cards[]={
> +static struct cs_card_type __initdata cards[]={
> {0x1489, 0x7001, "Genius Soundmaker 128 value", amp_none, NULL},
> {0x5053, 0x3357, "Voyetra", amp_voyetra, NULL},
> /* MI6020/21 use the same chipset as the Thinkpads, maybe needed */

This 'hunk' of the patch is correct.


> @@ -2494,7 +2494,7 @@
> {PCI_VENDOR_ID_IBM, 0x0132, "Thinkpad 570", amp_none, clkrun_hack},
> {PCI_VENDOR_ID_IBM, 0x0153, "Thinkpad 600X/A20/T20", amp_none, clkrun_hack},
> {PCI_VENDOR_ID_IBM, 0x1010, "Thinkpad 600E (unsupported)", NULL, NULL},
> - {0, 0, NULL, NULL}
> + {0, 0, NULL, NULL, NULL}
> };

Just leave it at "{ 0, }" and gcc will fill in the rest of the struct
members as zero.

Jeff




--
Jeff Garzik | Isn't it strange that the same people
Building 1024 | that laugh at gypsy fortune tellers
MandrakeSoft, Inc. | take economists seriously?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 12:51    [W:0.089 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site