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

[sfrench/cifs-2.6.git] / sound / isa / sc6000.c

diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index 94daf839999463e17808768115a180a1dc2f6046..da3d152bcad4d0b5bd7d29b2c1ee1cb5104eaf7a 100644 (file)
--- a/sound/isa/sc6000.c
+++ b/sound/isa/sc6000.c
@@ -23,7 +23,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/isa.h>
@@ -390,7 +389,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma,
 
        err = sc6000_init_mss(vport, config, vmss_port, mss_config);
        if (err < 0) {
-               snd_printk(KERN_ERR "Can not initialize"
+               snd_printk(KERN_ERR "Can not initialize "
                           "Microsoft Sound System mode.\n");
                return -ENODEV;
        }