diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-03-13 17:13:47 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 10:55:49 -0400 |
commit | 1b60f6b0904737cb76cd4cd46b57592318c9a20e (patch) | |
tree | f2919cf556d3650a72ef28de357c48ccc8808891 /sound/pci/ice1712/prodigy192.c | |
parent | bf748ed73e6978657102bddb1c4cc8a8f342c484 (diff) |
[ALSA] Fix conflicts between const and __devinitdata
Marvin told with a depressed face,
gcc doesn't like both __devinitdata and const in the same line.
So, remove const from all over places now...
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ice1712/prodigy192.c')
-rw-r--r-- | sound/pci/ice1712/prodigy192.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index 31cc66eb9f8f..9aad6b38e2b2 100644 --- a/sound/pci/ice1712/prodigy192.c +++ b/sound/pci/ice1712/prodigy192.c | |||
@@ -364,7 +364,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0); | |||
364 | * mixers | 364 | * mixers |
365 | */ | 365 | */ |
366 | 366 | ||
367 | static const struct snd_kcontrol_new stac_controls[] __devinitdata = { | 367 | static struct snd_kcontrol_new stac_controls[] __devinitdata = { |
368 | { | 368 | { |
369 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 369 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
370 | .name = "Master Playback Switch", | 370 | .name = "Master Playback Switch", |
@@ -506,7 +506,7 @@ static int __devinit prodigy192_init(struct snd_ice1712 *ice) | |||
506 | * hence the driver needs to sets up it properly. | 506 | * hence the driver needs to sets up it properly. |
507 | */ | 507 | */ |
508 | 508 | ||
509 | static const unsigned char prodigy71_eeprom[] __devinitdata = { | 509 | static unsigned char prodigy71_eeprom[] __devinitdata = { |
510 | [ICE_EEP2_SYSCONF] = 0x2b, /* clock 512, mpu401, spdif-in/ADC, 4DACs */ | 510 | [ICE_EEP2_SYSCONF] = 0x2b, /* clock 512, mpu401, spdif-in/ADC, 4DACs */ |
511 | [ICE_EEP2_ACLINK] = 0x80, /* I2S */ | 511 | [ICE_EEP2_ACLINK] = 0x80, /* I2S */ |
512 | [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ | 512 | [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ |
@@ -524,7 +524,7 @@ static const unsigned char prodigy71_eeprom[] __devinitdata = { | |||
524 | 524 | ||
525 | 525 | ||
526 | /* entry point */ | 526 | /* entry point */ |
527 | const struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = { | 527 | struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = { |
528 | { | 528 | { |
529 | .subvendor = VT1724_SUBDEVICE_PRODIGY192VE, | 529 | .subvendor = VT1724_SUBDEVICE_PRODIGY192VE, |
530 | .name = "Audiotrak Prodigy 192", | 530 | .name = "Audiotrak Prodigy 192", |