Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[linux-2.6] / sound / isa / sb / sb8.c

diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index b7de1bc0e8a418b8cb5983bc25984540c7030283..336a34277907f0ec74b30816187eb3d14c7909d3 100644 (file)
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for SoundBlaster 1.0/2.0/Pro soundcards and compatible
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/isa.h>
@@ -31,7 +30,7 @@
 #include <sound/opl3.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Sound Blaster 1.0/2.0/Pro");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB 1.0/SB 2.0/SB Pro}}");
@@ -239,7 +238,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)
 }
 #endif
 
-#define SND_SB8_DRIVER "snd_sb8"
+#define DEV_NAME "sb8"
 
 static struct isa_driver snd_sb8_driver = {
        .match          = snd_sb8_match,
@@ -250,7 +249,7 @@ static struct isa_driver snd_sb8_driver = {
        .resume         = snd_sb8_resume,
 #endif
        .driver         = {
-               .name   = SND_SB8_DRIVER
+               .name   = DEV_NAME 
        },
 };