summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2007-05-04 09:35:54 +0200
committerJaroslav Kysela <perex@suse.cz>2007-05-11 16:56:15 +0200
commit2393144deac0903d944cbd578db49cf738811999 (patch)
tree977401512860b34aaa8d309a5d07e949c73abb7d /sound
parent7b043899992e5d9c0b1a620cdad9158d2e5484d7 (diff)
downloadlinux-3.10-2393144deac0903d944cbd578db49cf738811999.tar.gz
linux-3.10-2393144deac0903d944cbd578db49cf738811999.tar.bz2
linux-3.10-2393144deac0903d944cbd578db49cf738811999.zip
[ALSA] wavefront: only declare isapnp on CONFIG_PNP
From: David Rientjes <rientjes@google.com> isapnp[] is only used for CONFIG_PNP. If this configuration option is not set, do not declare the array. Cc: Adam Belay <ambx1@neo.rr.com> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/wavefront/wavefront.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index ae2038e682f..75673f72385 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 */