summaryrefslogtreecommitdiffstats
path: root/sound/oss/sb_ess.c
diff options
context:
space:
mode:
authorRussell King2009-12-04 15:59:47 +0100
committerRussell King2009-12-04 15:59:47 +0100
commit5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch)
tree7b72b66081d042a41dc822575503133364857ce2 /sound/oss/sb_ess.c
parentARM: 5846/1: MAINTAINERS: Add arm Nomadik support (diff)
parentARM: I-cache: flush executable mappings in flush_cache_range() (diff)
downloadkernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.gz
kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz
kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.zip
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'sound/oss/sb_ess.c')
-rw-r--r--sound/oss/sb_ess.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 180e95c87e3e..51a3d381a59e 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
break;
default:;
- /* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
+ /* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
}
}