git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
sound
/
isa
/
wavefront
/
wavefront_synth.c
diff --git
a/sound/isa/wavefront/wavefront_synth.c
b/sound/isa/wavefront/wavefront_synth.c
index
68aa091
..
bed329e
100644
(file)
--- a/
sound/isa/wavefront/wavefront_synth.c
+++ b/
sound/isa/wavefront/wavefront_synth.c
@@
-1738,7
+1738,7
@@
snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)
7 Unused
*/
7 Unused
*/
-static int __init
+static int __
dev
init
snd_wavefront_interrupt_bits (int irq)
{
snd_wavefront_interrupt_bits (int irq)
{
@@
-1766,7
+1766,7
@@
snd_wavefront_interrupt_bits (int irq)
return bits;
}
return bits;
}
-static void __init
+static void __
dev
init
wavefront_should_cause_interrupt (snd_wavefront_t *dev,
int val, int port, int timeout)
wavefront_should_cause_interrupt (snd_wavefront_t *dev,
int val, int port, int timeout)
@@
-1787,7
+1787,7
@@
wavefront_should_cause_interrupt (snd_wavefront_t *dev,
}
}
}
}
-static int __init
+static int __
dev
init
wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
{
wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
{
@@
-1946,7
+1946,7
@@
wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-static int __init
+static int __
dev
init
wavefront_download_firmware (snd_wavefront_t *dev, char *path)
{
wavefront_download_firmware (snd_wavefront_t *dev, char *path)
{
@@
-2047,7
+2047,7
@@
wavefront_download_firmware (snd_wavefront_t *dev, char *path)
}
}
-static int __init
+static int __
dev
init
wavefront_do_reset (snd_wavefront_t *dev)
{
wavefront_do_reset (snd_wavefront_t *dev)
{
@@
-2136,7
+2136,7
@@
wavefront_do_reset (snd_wavefront_t *dev)
return 1;
}
return 1;
}
-int __init
+int __
dev
init
snd_wavefront_start (snd_wavefront_t *dev)
{
snd_wavefront_start (snd_wavefront_t *dev)
{
@@
-2178,7
+2178,7
@@
snd_wavefront_start (snd_wavefront_t *dev)
return (0);
}
return (0);
}
-int __init
+int __
dev
init
snd_wavefront_detect (snd_wavefront_card_t *card)
{
snd_wavefront_detect (snd_wavefront_card_t *card)
{