diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-03-13 22:13:47 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:49 +0200 |
| commit | 1b60f6b0904737cb76cd4cd46b57592318c9a20e (patch) | |
| tree | f2919cf556d3650a72ef28de357c48ccc8808891 /sound/pci/ice1712/juli.c | |
| parent | bf748ed73e6978657102bddb1c4cc8a8f342c484 (diff) | |
| download | linux-1b60f6b0904737cb76cd4cd46b57592318c9a20e.tar.bz2 | |
[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/juli.c')
| -rw-r--r-- | sound/pci/ice1712/juli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index d88172fa95da..6d3c63352b71 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c @@ -125,7 +125,7 @@ static void juli_akm_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate) snd_akm4xxx_reset(ak, 0); } -static const struct snd_akm4xxx akm_juli_dac __devinitdata = { +static struct snd_akm4xxx akm_juli_dac __devinitdata = { .type = SND_AK4358, .num_dacs = 2, .ops = { @@ -206,7 +206,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice) * hence the driver needs to sets up it properly. */ -static const unsigned char juli_eeprom[] __devinitdata = { +static unsigned char juli_eeprom[] __devinitdata = { [ICE_EEP2_SYSCONF] = 0x20, /* clock 512, mpu401, 1xADC, 1xDACs */ [ICE_EEP2_ACLINK] = 0x80, /* I2S */ [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ @@ -223,7 +223,7 @@ static const unsigned char juli_eeprom[] __devinitdata = { }; /* entry point */ -const struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = { +struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = { { .subvendor = VT1724_SUBDEVICE_JULI, .name = "ESI Juli@", |