Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / include / sound / pcm.h

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 304025b235201a82982dc45817f35fb38a21a2ad..85f1c6bf8566944eaa85d6b8742ebef2a06e6ce9 100644 (file)
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -370,7 +370,7 @@ struct snd_pcm_substream {
        int number;
        char name[32];                  /* substream name */
        int stream;                     /* stream (direction) */
-       struct pm_qos_request_list *latency_pm_qos_req; /* pm_qos request */
+       struct pm_qos_request_list latency_pm_qos_req; /* pm_qos request */
        size_t buffer_bytes_max;        /* limit ring buffer size */
        struct snd_dma_buffer dma_buffer;
        unsigned int dma_buf_id;