mm: introduce free_pages_prepare()

[safe/jmp/linux-2.6] / sound / usb / quirks.c

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 99a19ba..136e5b4 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
 
@@ -24,7 +25,8 @@
 
 #include "usbaudio.h"
 #include "card.h"
-#include "usbmixer.h"
+#include "mixer.h"
+#include "mixer_quirks.h"
 #include "midi.h"
 #include "quirks.h"
 #include "helper.h"
@@ -159,8 +161,8 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
        fp->datainterval = snd_usb_parse_datainterval(chip, alts);
        fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
        usb_set_interface(chip->dev, fp->iface, 0);
-       snd_usb_init_pitch(chip->dev, fp->iface, alts, fp);
-       snd_usb_init_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max);
+       snd_usb_init_pitch(chip, fp->iface, alts, fp);
+       snd_usb_init_sample_rate(chip, fp->iface, alts, fp, fp->rate_max);
        return 0;
 }