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
/
pci
/
korg1212
/
korg1212.c
diff --git
a/sound/pci/korg1212/korg1212.c
b/sound/pci/korg1212/korg1212.c
index
e39fad1
..
cfea51f
100644
(file)
--- a/
sound/pci/korg1212/korg1212.c
+++ b/
sound/pci/korg1212/korg1212.c
@@
-424,7
+424,7
@@
module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard.");
MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>");
MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard.");
MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>");
-static struct pci_device_id snd_korg1212_ids[]
__devinitdata
= {
+static struct pci_device_id snd_korg1212_ids[] = {
{
.vendor = 0x10b5,
.device = 0x906d,
{
.vendor = 0x10b5,
.device = 0x906d,
@@
-2085,7
+2085,7
@@
static void __devinit snd_korg1212_proc_init(struct snd_korg1212 *korg1212)
struct snd_info_entry *entry;
if (! snd_card_proc_new(korg1212->card, "korg1212", &entry))
struct snd_info_entry *entry;
if (! snd_card_proc_new(korg1212->card, "korg1212", &entry))
- snd_info_set_text_ops(entry, korg1212,
1024,
snd_korg1212_proc_read);
+ snd_info_set_text_ops(entry, korg1212, snd_korg1212_proc_read);
}
static int
}
static int
@@
-2237,7
+2237,7
@@
static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *
}
err = request_irq(pci->irq, snd_korg1212_interrupt,
}
err = request_irq(pci->irq, snd_korg1212_interrupt,
-
SA_INTERRUPT|SA_SHIRQ
,
+
IRQF_DISABLED|IRQF_SHARED
,
"korg1212", korg1212);
if (err) {
"korg1212", korg1212);
if (err) {