aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-12-07 03:07:25 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:30:35 -0500
commit156b2aa3bef17c964006c6448aadd440781d7e7d (patch)
tree9d18ec3699259ef51dbf5d9866d48de51bdd2654 /sound
parenta3bcba384c2f2448ad204ea52baa15f1227d0d40 (diff)
[ALSA] ens1371: fix compilation without SUPPORT_JOYSTICK
Modules: ENS1370/1+ driver Move the spdif and lineio parameters around so that they are compiled even when SUPPORT_JOYSTICK isn't set. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ens1370.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 856f7c63d32f..55aaf110331a 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -86,12 +86,14 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable switches */
86#ifdef SUPPORT_JOYSTICK 86#ifdef SUPPORT_JOYSTICK
87#ifdef CHIP1371 87#ifdef CHIP1371
88static int joystick_port[SNDRV_CARDS]; 88static int joystick_port[SNDRV_CARDS];
89static int spdif[SNDRV_CARDS];
90static int lineio[SNDRV_CARDS];
91#else 89#else
92static int joystick[SNDRV_CARDS]; 90static int joystick[SNDRV_CARDS];
93#endif 91#endif
94#endif 92#endif
93#ifdef CHIP1371
94static int spdif[SNDRV_CARDS];
95static int lineio[SNDRV_CARDS];
96#endif
95 97
96module_param_array(index, int, NULL, 0444); 98module_param_array(index, int, NULL, 0444);
97MODULE_PARM_DESC(index, "Index value for Ensoniq AudioPCI soundcard."); 99MODULE_PARM_DESC(index, "Index value for Ensoniq AudioPCI soundcard.");
@@ -103,15 +105,17 @@ MODULE_PARM_DESC(enable, "Enable Ensoniq AudioPCI soundcard.");
103#ifdef CHIP1371 105#ifdef CHIP1371
104module_param_array(joystick_port, int, NULL, 0444); 106module_param_array(joystick_port, int, NULL, 0444);
105MODULE_PARM_DESC(joystick_port, "Joystick port address."); 107MODULE_PARM_DESC(joystick_port, "Joystick port address.");
106module_param_array(spdif, int, NULL, 0444);
107MODULE_PARM_DESC(spdif, "S/PDIF output (-1 = none, 0 = auto, 1 = force).");
108module_param_array(lineio, int, NULL, 0444);
109MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");
110#else 108#else
111module_param_array(joystick, bool, NULL, 0444); 109module_param_array(joystick, bool, NULL, 0444);
112MODULE_PARM_DESC(joystick, "Enable joystick."); 110MODULE_PARM_DESC(joystick, "Enable joystick.");
113#endif 111#endif
114#endif /* SUPPORT_JOYSTICK */ 112#endif /* SUPPORT_JOYSTICK */
113#ifdef CHIP1371
114module_param_array(spdif, int, NULL, 0444);
115MODULE_PARM_DESC(spdif, "S/PDIF output (-1 = none, 0 = auto, 1 = force).");
116module_param_array(lineio, int, NULL, 0444);
117MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");
118#endif
115 119
116/* ES1371 chip ID */ 120/* ES1371 chip ID */
117/* This is a little confusing because all ES1371 compatible chips have the 121/* This is a little confusing because all ES1371 compatible chips have the