diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:42 -0500 |
| commit | 16bc67edeb49b531940b2ba6c183780a1b5c472d (patch) | |
| tree | 71b4bc48e47e54f2c0b3126d8f81d2f31b707ea8 /sound/oss/sb_common.c | |
| parent | f6630114d9198aa959ac95c131334c020038f253 (diff) | |
| parent | 047106adcc85e3023da210143a6ab8a55df9e0fc (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Pick up fixes that did not make it into .32.0
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/oss/sb_common.c')
| -rw-r--r-- | sound/oss/sb_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c index 77d0e5efda76..ce4db49291f7 100644 --- a/sound/oss/sb_common.c +++ b/sound/oss/sb_common.c | |||
| @@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc) | |||
| 157 | break; | 157 | break; |
| 158 | 158 | ||
| 159 | default: | 159 | default: |
| 160 | /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ | 160 | /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */ |
| 161 | ; | 161 | ; |
| 162 | } | 162 | } |
| 163 | } | 163 | } |
| @@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc) | |||
| 177 | break; | 177 | break; |
| 178 | 178 | ||
| 179 | default: | 179 | default: |
| 180 | /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ | 180 | /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */ |
| 181 | ; | 181 | ; |
| 182 | } | 182 | } |
| 183 | } | 183 | } |