Merge commit 'v2.6.29-rc1' into core/urgent
[linux-2.6] / sound / isa / cs423x / cs4232.c
1 #define CS4232
2 #include "cs4236.c"