projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
sound
/
drivers
/
mts64.c
diff --git
a/sound/drivers/mts64.c
b/sound/drivers/mts64.c
index
5327c6f
..
6c9f4c9
100644
(file)
--- a/
sound/drivers/mts64.c
+++ b/
sound/drivers/mts64.c
@@
-1026,7
+1026,7
@@
__err:
return err;
}
return err;
}
-static int snd_mts64_remove(struct platform_device *pdev)
+static int
__devexit
snd_mts64_remove(struct platform_device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
{
struct snd_card *card = platform_get_drvdata(pdev);
@@
-1039,7
+1039,7
@@
static int snd_mts64_remove(struct platform_device *pdev)
static struct platform_driver snd_mts64_driver = {
.probe = snd_mts64_probe,
static struct platform_driver snd_mts64_driver = {
.probe = snd_mts64_probe,
- .remove =
snd_mts64_remove
,
+ .remove =
__devexit_p(snd_mts64_remove)
,
.driver = {
.name = PLATFORM_DRIVER
}
.driver = {
.name = PLATFORM_DRIVER
}
@@
-1048,7
+1048,7
@@
static struct platform_driver snd_mts64_driver = {
/*********************************************************************
* module init stuff
*********************************************************************/
/*********************************************************************
* module init stuff
*********************************************************************/
-static void snd_mts64_unregister_all(void)
+static void
__init_or_module
snd_mts64_unregister_all(void)
{
int i;
{
int i;