diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-03-14 00:13:47 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 18:55:49 +0400 |
| commit | 1b60f6b0904737cb76cd4cd46b57592318c9a20e (patch) | |
| tree | f2919cf556d3650a72ef28de357c48ccc8808891 /sound/pci/ice1712/pontis.c | |
| parent | bf748ed73e6978657102bddb1c4cc8a8f342c484 (diff) | |
| download | linux-1b60f6b0904737cb76cd4cd46b57592318c9a20e.tar.xz | |
[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/pontis.c')
| -rw-r--r-- | sound/pci/ice1712/pontis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index 9552497f0765..01c69453ddeb 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c @@ -571,7 +571,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_volume, -6400, 50, 1); * mixers */ -static const struct snd_kcontrol_new pontis_controls[] __devinitdata = { +static struct snd_kcontrol_new pontis_controls[] __devinitdata = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | @@ -826,7 +826,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice) * hence the driver needs to sets up it properly. */ -static const unsigned char pontis_eeprom[] __devinitdata = { +static unsigned char pontis_eeprom[] __devinitdata = { [ICE_EEP2_SYSCONF] = 0x08, /* clock 256, mpu401, spdif-in/ADC, 1DAC */ [ICE_EEP2_ACLINK] = 0x80, /* I2S */ [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ @@ -843,7 +843,7 @@ static const unsigned char pontis_eeprom[] __devinitdata = { }; /* entry point */ -const struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = { +struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = { { .subvendor = VT1720_SUBDEVICE_PONTIS_MS300, .name = "Pontis MS300", |