Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2393144deac0903d944cbd578db49cf738811999
Commit: 2393144deac0903d944cbd578db49cf738811999
Parent: 7b043899992e5d9c0b1a620cdad9158d2e5484d7
Author: David Rientjes <[EMAIL PROTECTED]>
AuthorDate: Fri May 4 09:35:54 2007 +0200
Committer: Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Fri May 11 16:56:15 2007 +0200
[ALSA] wavefront: only declare isapnp on CONFIG_PNP
From: David Rientjes <[EMAIL PROTECTED]>
isapnp[] is only used for CONFIG_PNP. If this configuration option is
not set, do not declare the array.
Cc: Adam Belay <[EMAIL PROTECTED]>
Cc: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: David Rientjes <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
sound/isa/wavefront/wavefront.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index ae2038e..75673f7 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -40,7 +40,9 @@ MODULE_SUPPORTED_DEVICE("{{Turtle
Beach,Maui/Tropez/Tropez+}}");
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card
*/
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card
*/
+#ifdef CONFIG_PNP
static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+#endif
static long cs4232_pcm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
static int cs4232_pcm_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,11,12,15
*/
static long cs4232_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
