diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /sound/oss/sb_common.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
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 | } |