Messages in this thread Patch in this message | | | Date | Tue, 26 Jan 1999 08:35:20 +0100 (CET) | From | Niels Kristian Bech Jensen <> | Subject | [2.2.0][PATCH] Fix for sound compile problem. |
| |
Hi, This patch fixes the sound compile problem in 2.2.0:
diff -urN linux-2.2.0/drivers/sound/sb_ess.c linux/drivers/sound/sb_ess.c --- linux-2.2.0/drivers/sound/sb_ess.c Tue Jan 26 05:24:39 1999 +++ linux/drivers/sound/sb_ess.c Tue Jan 26 07:30:38 1999 @@ -162,7 +162,9 @@ #include "sb_ess.h" +#ifdef MODULE extern int esstype; /* module parameter in sb_card.c */ +#endif #ifdef FKS_LOGGING static void ess_show_mixerregs (sb_devc *devc); @@ -976,7 +978,10 @@ unsigned char cfg; int ess_major = 0, ess_minor = 0; int i; - static char name[100], modelname[10]; + static char name[100]; +#ifdef MODULE + static char modelname[10]; +#endif /* * Try to detect ESS chips. @@ -1026,6 +1031,7 @@ if (ess_major == 0x68 && (ess_minor & 0xf0) == 0x80) { char *chip = NULL; +#ifdef MODULE if (esstype) { int submodel = -1; @@ -1058,6 +1064,7 @@ chip = modelname; }; }; +#endif if (chip == NULL && (ess_minor & 0x0f) < 8) { chip = "ES688"; }; -- Niels Kristian Bech Jensen -- nkbj@image.dk -- http://www.image.dk/~nkbj/
----------->> Stop software piracy --- use free software! <<-----------
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |