Merge branch 'master' into upstream
[linux-2.6] / sound / isa / opti9xx / opti92x-cs4231.c
1 #define CS4231
2 #include "opti92x-ad1848.c"