Merge branch 'merge' into powerpc-next
[linux-2.6] / include / sound / driver.h
1 #warning "This file is deprecated"