PM: Introduce PM_EVENT_HIBERNATE callback state

[linux-2.6-omap-h63xx.git] / sound / pci / pcxhr / pcxhr_hwdep.c

diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 03517c10e99c25ffa1ff7438d9d1af5404fbd1ec..e6a4bfbb91bb664ed933c3a8c95e286b5876ac83 100644 (file)
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -20,7 +20,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
 #include <linux/firmware.h>
@@ -356,6 +355,12 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
        return 0;
 }
 
+MODULE_FIRMWARE("pcxhr/xi_1_882.dat");
+MODULE_FIRMWARE("pcxhr/xc_1_882.dat");
+MODULE_FIRMWARE("pcxhr/e321_512.e56");
+MODULE_FIRMWARE("pcxhr/b321_512.b56");
+MODULE_FIRMWARE("pcxhr/d321_512.d56");
+
 #else /* old style firmware loading */
 
 /* pcxhr hwdep interface id string */
@@ -385,8 +390,8 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw,
        fw.size = dsp->length;
        fw.data = vmalloc(fw.size);
        if (! fw.data) {
-               snd_printk(KERN_ERR "pcxhr: cannot allocate dsp image (%d bytes)\n",
-                          fw.size);
+               snd_printk(KERN_ERR "pcxhr: cannot allocate dsp image (%lu bytes)\n",
+                          (unsigned long)fw.size);
                return -ENOMEM;
        }
        if (copy_from_user(fw.data, dsp->image, dsp->length)) {