diff options
author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/drivers/opl3/opl3_synth.c | |
parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'sound/drivers/opl3/opl3_synth.c')
-rw-r--r-- | sound/drivers/opl3/opl3_synth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c index 962bb9c8b9c8..6d57b6441dec 100644 --- a/sound/drivers/opl3/opl3_synth.c +++ b/sound/drivers/opl3/opl3_synth.c | |||
@@ -168,7 +168,7 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file, | |||
168 | 168 | ||
169 | #ifdef CONFIG_SND_DEBUG | 169 | #ifdef CONFIG_SND_DEBUG |
170 | default: | 170 | default: |
171 | snd_printk("unknown IOCTL: 0x%x\n", cmd); | 171 | snd_printk(KERN_WARNING "unknown IOCTL: 0x%x\n", cmd); |
172 | #endif | 172 | #endif |
173 | } | 173 | } |
174 | return -ENOTTY; | 174 | return -ENOTTY; |