diff options
Diffstat (limited to 'sound/pci/ice1712/psc724.c')
| -rw-r--r-- | sound/pci/ice1712/psc724.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sound/pci/ice1712/psc724.c b/sound/pci/ice1712/psc724.c index 5a4abe77995f..457cbaab0c6e 100644 --- a/sound/pci/ice1712/psc724.c +++ b/sound/pci/ice1712/psc724.c | |||
| @@ -254,7 +254,7 @@ static bool psc724_get_jack_detection(struct snd_ice1712 *ice) | |||
| 254 | /* mixer controls */ | 254 | /* mixer controls */ |
| 255 | 255 | ||
| 256 | struct psc724_control { | 256 | struct psc724_control { |
| 257 | char *name; | 257 | const char *name; |
| 258 | void (*set)(struct snd_ice1712 *ice, bool on); | 258 | void (*set)(struct snd_ice1712 *ice, bool on); |
| 259 | bool (*get)(struct snd_ice1712 *ice); | 259 | bool (*get)(struct snd_ice1712 *ice); |
| 260 | }; | 260 | }; |
| @@ -294,27 +294,27 @@ static int psc724_ctl_put(struct snd_kcontrol *kcontrol, | |||
| 294 | return 0; | 294 | return 0; |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | static char *front_volume = "Front Playback Volume"; | 297 | static const char *front_volume = "Front Playback Volume"; |
| 298 | static char *front_switch = "Front Playback Switch"; | 298 | static const char *front_switch = "Front Playback Switch"; |
| 299 | static char *front_zc = "Front Zero Cross Detect Playback Switch"; | 299 | static const char *front_zc = "Front Zero Cross Detect Playback Switch"; |
| 300 | static char *front_izd = "Front Infinite Zero Detect Playback Switch"; | 300 | static const char *front_izd = "Front Infinite Zero Detect Playback Switch"; |
| 301 | static char *front_phase = "Front Phase Invert Playback Switch"; | 301 | static const char *front_phase = "Front Phase Invert Playback Switch"; |
| 302 | static char *front_deemph = "Front Deemphasis Playback Switch"; | 302 | static const char *front_deemph = "Front Deemphasis Playback Switch"; |
| 303 | static char *ain1_switch = "Line Capture Switch"; | 303 | static const char *ain1_switch = "Line Capture Switch"; |
| 304 | static char *ain2_switch = "CD Capture Switch"; | 304 | static const char *ain2_switch = "CD Capture Switch"; |
| 305 | static char *ain3_switch = "AUX Capture Switch"; | 305 | static const char *ain3_switch = "AUX Capture Switch"; |
| 306 | static char *ain4_switch = "Front Mic Capture Switch"; | 306 | static const char *ain4_switch = "Front Mic Capture Switch"; |
| 307 | static char *ain5_switch = "Rear Mic Capture Switch"; | 307 | static const char *ain5_switch = "Rear Mic Capture Switch"; |
| 308 | static char *rear_volume = "Surround Playback Volume"; | 308 | static const char *rear_volume = "Surround Playback Volume"; |
| 309 | static char *clfe_volume = "CLFE Playback Volume"; | 309 | static const char *clfe_volume = "CLFE Playback Volume"; |
| 310 | static char *rear_switch = "Surround Playback Switch"; | 310 | static const char *rear_switch = "Surround Playback Switch"; |
| 311 | static char *clfe_switch = "CLFE Playback Switch"; | 311 | static const char *clfe_switch = "CLFE Playback Switch"; |
| 312 | static char *rear_phase = "Surround Phase Invert Playback Switch"; | 312 | static const char *rear_phase = "Surround Phase Invert Playback Switch"; |
| 313 | static char *clfe_phase = "CLFE Phase Invert Playback Switch"; | 313 | static const char *clfe_phase = "CLFE Phase Invert Playback Switch"; |
| 314 | static char *rear_deemph = "Surround Deemphasis Playback Switch"; | 314 | static const char *rear_deemph = "Surround Deemphasis Playback Switch"; |
| 315 | static char *clfe_deemph = "CLFE Deemphasis Playback Switch"; | 315 | static const char *clfe_deemph = "CLFE Deemphasis Playback Switch"; |
| 316 | static char *rear_clfe_izd = "Rear Infinite Zero Detect Playback Switch"; | 316 | static const char *rear_clfe_izd = "Rear Infinite Zero Detect Playback Switch"; |
| 317 | static char *rear_clfe_zc = "Rear Zero Cross Detect Playback Switch"; | 317 | static const char *rear_clfe_zc = "Rear Zero Cross Detect Playback Switch"; |
| 318 | 318 | ||
| 319 | static int __devinit psc724_add_controls(struct snd_ice1712 *ice) | 319 | static int __devinit psc724_add_controls(struct snd_ice1712 *ice) |
| 320 | { | 320 | { |