mm, compaction: pass classzone_idx and alloc_flags to watermark checking

[pandora-kernel.git] / sound / soc / soc-utils.c

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 5e63365..7f22ca3 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -59,10 +59,6 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params)
 EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk);
 
 static const struct snd_pcm_hardware dummy_dma_hardware = {
-       .formats                = 0xffffffff,
-       .channels_min           = 1,
-       .channels_max           = UINT_MAX,
-
        /* Random values to keep userspace happy when checking constraints */
        .info                   = SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER,
@@ -123,6 +119,13 @@ static struct snd_soc_dai_driver dummy_dai = {
         },
 };
 
+int snd_soc_dai_is_dummy(struct snd_soc_dai *dai)
+{
+       if (dai->driver == &dummy_dai)
+               return 1;
+       return 0;
+}
+
 static int snd_soc_dummy_probe(struct platform_device *pdev)
 {
        int ret;