diff --git a/[refs] b/[refs] index 05e6e866b25f..d245afb45d0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95203aec21fcdff1f1fa5480a597d02416aa0a63 +refs/heads/master: 10c86be57724adf44c266300964182fd2966d108 diff --git a/trunk/sound/drivers/mts64.c b/trunk/sound/drivers/mts64.c index ebb1bdac7237..2025db5947ae 100644 --- a/trunk/sound/drivers/mts64.c +++ b/trunk/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/trunk/sound/oss/sb_card.c b/trunk/sound/oss/sb_card.c index 27acd6f29b98..7de18b58f2cd 100644 --- a/trunk/sound/oss/sb_card.c +++ b/trunk/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)