Merge branch 'xen/dev-evtchn' into upstream/evtchn

[karo-tx-linux.git] / sound / core / pcm_misc.c

diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index ea2bf82c93730505768c28f00174d6484ac2bcf9..434af3c56d52111c486301b3a7e483ab17806eb8 100644 (file)
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -128,6 +128,14 @@ static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {
                .width = 4, .phys = 4, .le = -1, .signd = -1,
                .silence = {},
        },
+       [SNDRV_PCM_FORMAT_G723_24] = {
+               .width = 3, .phys = 3, .le = -1, .signd = -1,
+               .silence = {},
+       },
+       [SNDRV_PCM_FORMAT_G723_40] = {
+               .width = 5, .phys = 5, .le = -1, .signd = -1,
+               .silence = {},
+       },
        /* FIXME: the following three formats are not defined properly yet */
        [SNDRV_PCM_FORMAT_MPEG] = {
                .le = -1, .signd = -1,
@@ -186,6 +194,14 @@ static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {
                .width = 18, .phys = 24, .le = 0, .signd = 0,
                .silence = { 0x02, 0x00, 0x00 },
        },
+       [SNDRV_PCM_FORMAT_G723_24_1B] = {
+               .width = 3, .phys = 8, .le = -1, .signd = -1,
+               .silence = {},
+       },
+       [SNDRV_PCM_FORMAT_G723_40_1B] = {
+               .width = 5, .phys = 8, .le = -1, .signd = -1,
+               .silence = {},
+       },
 };