summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-01-16 14:56:04 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:30:01 +0100
commit599c3e76fe89b314667e699a20ad08f8d16d0454 (patch)
treee8c64ce80e7ca87ecb4e83d2535ddb3ef4b9b139
parent1374f8ceeefcb24194c29b9a81ecc40118d2c4d1 (diff)
downloadblackbird-obmc-linux-599c3e76fe89b314667e699a20ad08f8d16d0454.tar.gz
blackbird-obmc-linux-599c3e76fe89b314667e699a20ad08f8d16d0454.zip
[ALSA] sound: fix caiaq section mismatches
Fix section mismatch in caiaq: these __devinit functions can be called at any time so they should not be __devinit. WARNING: vmlinux.o(.text+0x10a8dae): Section mismatch: reference to .init.text:snd_usb_caiaq_audio_init (between 'setup_card' and 'create_card') WARNING: vmlinux.o(.text+0x10a8dd6): Section mismatch: reference to .init.text:snd_usb_caiaq_midi_init (between 'setup_card' and 'create_card') Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--sound/usb/caiaq/caiaq-audio.c2
-rw-r--r--sound/usb/caiaq/caiaq-midi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index f7e5284b8620..2f9e9b2a7ffc 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -603,7 +603,7 @@ static void free_urbs(struct urb **urbs)
kfree(urbs);
}
-int __devinit snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
+int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
{
int i, ret;
diff --git a/sound/usb/caiaq/caiaq-midi.c b/sound/usb/caiaq/caiaq-midi.c
index 54270328be52..30b57f97c6e4 100644
--- a/sound/usb/caiaq/caiaq-midi.c
+++ b/sound/usb/caiaq/caiaq-midi.c
@@ -123,7 +123,7 @@ void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev,
snd_rawmidi_receive(dev->midi_receive_substream, buf, len);
}
-int __devinit snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
+int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
{
int ret;
struct snd_rawmidi *rmidi;
OpenPOWER on IntegriCloud