Merge branch 'linus' into x86/x2apic
[linux-2.6] / sound / pci / ens1371.c
1 #define CHIP1371
2 #include "ens1370.c"