Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / sound / oss / sound_firmware.h

extern int mod_firmware_load(const char *fn, char **fp);