diff --git a/[refs] b/[refs] index db4ad45b1b79..2f0e9cd487cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48779a0b8ffc45f7f2b519ef462a72b1c5208d09 +refs/heads/master: 7cc17a31ff5ca3d8e1719af88907beec7b1fd24e diff --git a/trunk/include/uapi/sound/asound.h b/trunk/include/uapi/sound/asound.h index 515b8fcd1ca9..1774a5c3ef10 100644 --- a/trunk/include/uapi/sound/asound.h +++ b/trunk/include/uapi/sound/asound.h @@ -492,7 +492,17 @@ enum { SNDRV_CHMAP_TRL, /* top rear left */ SNDRV_CHMAP_TRR, /* top rear right */ SNDRV_CHMAP_TRC, /* top rear center */ - SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC, + /* new definitions for UAC2 */ + SNDRV_CHMAP_TFLC, /* top front left center */ + SNDRV_CHMAP_TFRC, /* top front right center */ + SNDRV_CHMAP_TSL, /* top side left */ + SNDRV_CHMAP_TSR, /* top side right */ + SNDRV_CHMAP_LLFE, /* left LFE */ + SNDRV_CHMAP_RLFE, /* right LFE */ + SNDRV_CHMAP_BC, /* bottom center */ + SNDRV_CHMAP_BLC, /* bottom left center */ + SNDRV_CHMAP_BRC, /* bottom right center */ + SNDRV_CHMAP_LAST = SNDRV_CHMAP_BRC, }; #define SNDRV_CHMAP_POSITION_MASK 0xffff