diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-12-07 03:07:25 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:35 -0500 |
commit | 156b2aa3bef17c964006c6448aadd440781d7e7d (patch) | |
tree | 9d18ec3699259ef51dbf5d9866d48de51bdd2654 /sound | |
parent | a3bcba384c2f2448ad204ea52baa15f1227d0d40 (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.c | 16 |
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 |
88 | static int joystick_port[SNDRV_CARDS]; | 88 | static int joystick_port[SNDRV_CARDS]; |
89 | static int spdif[SNDRV_CARDS]; | ||
90 | static int lineio[SNDRV_CARDS]; | ||
91 | #else | 89 | #else |
92 | static int joystick[SNDRV_CARDS]; | 90 | static int joystick[SNDRV_CARDS]; |
93 | #endif | 91 | #endif |
94 | #endif | 92 | #endif |
93 | #ifdef CHIP1371 | ||
94 | static int spdif[SNDRV_CARDS]; | ||
95 | static int lineio[SNDRV_CARDS]; | ||
96 | #endif | ||
95 | 97 | ||
96 | module_param_array(index, int, NULL, 0444); | 98 | module_param_array(index, int, NULL, 0444); |
97 | MODULE_PARM_DESC(index, "Index value for Ensoniq AudioPCI soundcard."); | 99 | MODULE_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 |
104 | module_param_array(joystick_port, int, NULL, 0444); | 106 | module_param_array(joystick_port, int, NULL, 0444); |
105 | MODULE_PARM_DESC(joystick_port, "Joystick port address."); | 107 | MODULE_PARM_DESC(joystick_port, "Joystick port address."); |
106 | module_param_array(spdif, int, NULL, 0444); | ||
107 | MODULE_PARM_DESC(spdif, "S/PDIF output (-1 = none, 0 = auto, 1 = force)."); | ||
108 | module_param_array(lineio, int, NULL, 0444); | ||
109 | MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force)."); | ||
110 | #else | 108 | #else |
111 | module_param_array(joystick, bool, NULL, 0444); | 109 | module_param_array(joystick, bool, NULL, 0444); |
112 | MODULE_PARM_DESC(joystick, "Enable joystick."); | 110 | MODULE_PARM_DESC(joystick, "Enable joystick."); |
113 | #endif | 111 | #endif |
114 | #endif /* SUPPORT_JOYSTICK */ | 112 | #endif /* SUPPORT_JOYSTICK */ |
113 | #ifdef CHIP1371 | ||
114 | module_param_array(spdif, int, NULL, 0444); | ||
115 | MODULE_PARM_DESC(spdif, "S/PDIF output (-1 = none, 0 = auto, 1 = force)."); | ||
116 | module_param_array(lineio, int, NULL, 0444); | ||
117 | MODULE_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 |