Re: 2.6.1-mm1: sound/pci/cmipci.c compile error

[Andrew Morton]

Adrian Bunk <bunk@xxxxxxxxx> wrote:
>
> I got the following compile error when trying to compile 
> sound/pci/cmipci.c statically into the kernel:
> 
> <--  snip  -->
> 
> ...
>   CC      sound/pci/cmipci.o
> sound/pci/cmipci.c: In function `alsa_card_cmipci_setup':
> sound/pci/cmipci.c:3300: error: `joystick' undeclared (first use in this function)
> sound/pci/cmipci.c:3300: error: (Each undeclared identifier is reported only once
> sound/pci/cmipci.c:3300: error: for each function it appears in.)

Like this, methinks

diff -puN sound/pci/cmipci.c~cmipci-joystick-fix sound/pci/cmipci.c
--- 25/sound/pci/cmipci.c~cmipci-joystick-fix	Fri Jan  9 14:41:51 2004
+++ 25-akpm/sound/pci/cmipci.c	Fri Jan  9 14:41:59 2004
@@ -3297,7 +3297,7 @@ static int __init alsa_card_cmipci_setup
 	       && get_option(&str,&soft_ac3[nr_dev]) == 2
 #endif
 #ifdef SUPPORT_JOYSTICK
-	       && get_option(&str,&joystick[nr_dev]) == 2
+	       && get_option(&str,&joystick_port[nr_dev]) == 2
 #endif
 	       );
 	nr_dev++;

_

-
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/