Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / sound / isa / sgalaxy.c

diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 19e0b0edb8c46028a65242a548a172f2cdb5c876..922519def0997f2ff21ee74fc84ecb073012411c 100644 (file)
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -334,7 +334,7 @@ static int snd_sgalaxy_resume(struct device *pdev, unsigned int n)
 }
 #endif
 
-#define SND_SGALAXY_DRIVER     "snd_sgalaxy"
+#define DEV_NAME "sgalaxy"
 
 static struct isa_driver snd_sgalaxy_driver = {
        .match          = snd_sgalaxy_match,
@@ -345,7 +345,7 @@ static struct isa_driver snd_sgalaxy_driver = {
        .resume         = snd_sgalaxy_resume,
 #endif
        .driver         = {
-               .name   = SND_SGALAXY_DRIVER
+               .name   = DEV_NAME
        },
 };