projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
sound
/
pci
/
via82xx_modem.c
diff --git
a/sound/pci/via82xx_modem.c
b/sound/pci/via82xx_modem.c
index
22ce4d3
..
577a2b0
100644
(file)
--- a/
sound/pci/via82xx_modem.c
+++ b/
sound/pci/via82xx_modem.c
@@
-261,7
+261,7
@@
struct via82xx_modem {
struct snd_info_entry *proc_entry;
};
struct snd_info_entry *proc_entry;
};
-static struct pci_device_id snd_via82xx_modem_ids[] = {
+static struct pci_device_id snd_via82xx_modem_ids[]
__devinitdata
= {
{ 0x1106, 0x3068, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA82XX_MODEM, },
{ 0, }
};
{ 0x1106, 0x3068, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA82XX_MODEM, },
{ 0, }
};
@@
-929,7
+929,7
@@
static void __devinit snd_via82xx_proc_init(struct via82xx_modem *chip)
struct snd_info_entry *entry;
if (! snd_card_proc_new(chip->card, "via82xx", &entry))
struct snd_info_entry *entry;
if (! snd_card_proc_new(chip->card, "via82xx", &entry))
- snd_info_set_text_ops(entry, chip,
1024,
snd_via82xx_proc_read);
+ snd_info_set_text_ops(entry, chip, snd_via82xx_proc_read);
}
/*
}
/*