diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-04 20:24:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-04 20:24:57 -0400 |
| commit | 9c5ef0fbfa0b0be219290b05a39135b957479251 (patch) | |
| tree | deacd1ff7238ed0faf6a5d90f816e3135774b63d /sound | |
| parent | 8f1a866fc6831f13593fae6194e3150d45976628 (diff) | |
| parent | 190045d53b9a8341e8600d6eb468b6081e903afb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/drivers/mts64.c | 2 | ||||
| -rw-r--r-- | sound/isa/opl3sa2.c | 2 | ||||
| -rw-r--r-- | sound/oss/sb_card.c | 2 | ||||
| -rw-r--r-- | sound/pci/ice1712/prodigy192.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index ebb1bdac723..2025db5947a 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -1048,7 +1048,7 @@ static struct platform_driver snd_mts64_driver = { /********************************************************************* * module init stuff *********************************************************************/ -static void __init_or_module snd_mts64_unregister_all(void) +static void snd_mts64_unregister_all(void) { int i; diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 61a323cc0e4..4f6800b43b0 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c @@ -953,7 +953,7 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n) static struct isa_driver snd_opl3sa2_isa_driver = { .match = snd_opl3sa2_isa_match, .probe = snd_opl3sa2_isa_probe, - .remove = __devexit( snd_opl3sa2_isa_remove), + .remove = __devexit_p(snd_opl3sa2_isa_remove), #ifdef CONFIG_PM .suspend = snd_opl3sa2_isa_suspend, .resume = snd_opl3sa2_isa_resume, diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c index 27acd6f29b9..7de18b58f2c 100644 --- a/sound/oss/sb_card.c +++ b/sound/oss/sb_card.c @@ -290,7 +290,7 @@ static struct pnp_card_driver sb_pnp_driver = { MODULE_DEVICE_TABLE(pnp_card, sb_pnp_card_table); #endif /* CONFIG_PNP */ -static void __init_or_module sb_unregister_all(void) +static void sb_unregister_all(void) { #ifdef CONFIG_PNP if (pnp_registered) diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index f03c02c0774..4bae7305a79 100644 --- a/sound/pci/ice1712/prodigy192.c +++ b/sound/pci/ice1712/prodigy192.c @@ -705,7 +705,7 @@ static int ak4114_input_sw_put(struct snd_kcontrol *kcontrol, } -static const struct snd_kcontrol_new ak4114_controls[] __devinitdata = { +static struct snd_kcontrol_new ak4114_controls[] __devinitdata = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "MIODIO IEC958 Capture Input", |