summaryrefslogtreecommitdiffstats
path: root/sound/drivers/mts64.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-07-19 00:38:57 +0000
committerSteve French <sfrench@us.ibm.com>2007-07-19 00:38:57 +0000
commit1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch)
tree860b95e9a499ade4060848740fc6ce1fbb4e4e8d /sound/drivers/mts64.c
parent70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff)
parent5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff)
downloadlinux-1ff8392c32a2645d2665ca779ecb91bb29361c13.tar.gz
linux-1ff8392c32a2645d2665ca779ecb91bb29361c13.tar.bz2
linux-1ff8392c32a2645d2665ca779ecb91bb29361c13.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: fs/cifs/export.c
Diffstat (limited to 'sound/drivers/mts64.c')
-rw-r--r--sound/drivers/mts64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index ebb1bdac7237..2025db5947ae 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;