---

 25-akpm/sound/pci/cmipci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

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++;

_