diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /sound/core/misc.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'sound/core/misc.c')
| -rw-r--r-- | sound/core/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/misc.c b/sound/core/misc.c index 465f0ce772cb..768167925409 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c | |||
| @@ -72,7 +72,7 @@ void __snd_printk(unsigned int level, const char *path, int line, | |||
| 72 | char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV"; | 72 | char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV"; |
| 73 | #endif | 73 | #endif |
| 74 | 74 | ||
| 75 | #ifdef CONFIG_SND_DEBUG | 75 | #ifdef CONFIG_SND_DEBUG |
| 76 | if (debug < level) | 76 | if (debug < level) |
| 77 | return; | 77 | return; |
| 78 | #endif | 78 | #endif |