[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <s5hr3fzjm4f.wl-tiwai@suse.de>
Date: Fri, 26 Feb 2016 20:40:48 +0100
From: Takashi Iwai <tiwai@...e.de>
To: "Mauro Carvalho Chehab" <mchehab@....samsung.com>
Cc: "Shuah Khan" <shuahkh@....samsung.com>, <geliangtang@....com>,
<alsa-devel@...a-project.org>, <arnd@...db.de>,
<ricard.wanderlof@...s.com>, <hans.verkuil@...co.com>,
<labbott@...oraproject.org>, <chehabrafael@...il.com>,
<klock.android@...il.com>, <misterpib@...il.com>,
<prabhakar.csengg@...il.com>, <ricardo.ribalda@...il.com>,
<ruchandani.tina@...il.com>, <takamichiho@...il.com>,
<tvboxspy@...il.com>, <dominic.sacre@....de>, <albert@...tsing.nl>,
<laurent.pinchart@...asonboard.com>, <crope@....fi>,
<julian@...st.de>, <clemens@...isch.de>,
<pierre-louis.bossart@...ux.intel.com>,
<sakari.ailus@...ux.intel.com>, <corbet@....net>,
<joe@...po.co.uk>, <johan@...ud.se>, <dan.carpenter@...cle.com>,
<pawel@...iak.com>, <javier@....samsung.com>,
<p.zabel@...gutronix.de>, <perex@...ex.cz>,
<stefanr@...6.in-berlin.de>, <inki.dae@...sung.com>,
<j.anaszewski@...sung.com>, <jh1009.sung@...sung.com>,
<k.kozlowski@...sung.com>, <kyungmin.park@...sung.com>,
<m.szyprowski@...sung.com>, <nenggun.kim@...sung.com>,
<sw0312.kim@...sung.com>, <elfring@...rs.sourceforge.net>,
<linux-kernel@...r.kernel.org>, <linux-media@...r.kernel.org>,
<linuxbugs@...tgam.net>, <gtmkramer@...all.nl>,
<normalperson@...t.net>, <daniel@...que.org>
Subject: Re: [PATCH v3 04/22] media: Add ALSA Media Controller function entities
On Wed, 17 Feb 2016 13:25:05 +0100,
Mauro Carvalho Chehab wrote:
>
> Em Thu, 11 Feb 2016 16:41:20 -0700
> Shuah Khan <shuahkh@....samsung.com> escreveu:
>
> > Add ALSA Media Controller capture, playback, and mixer
> > function entity defines.
> >
> > Signed-off-by: Shuah Khan <shuahkh@....samsung.com>
> > ---
> > include/uapi/linux/media.h | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
> > index 3cc0366..449462e 100644
> > --- a/include/uapi/linux/media.h
> > +++ b/include/uapi/linux/media.h
> > @@ -98,6 +98,13 @@ struct media_device_info {
> > #define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42)
> >
> > /*
> > + * Audio Entity Functions
> > + */
> > +#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 200)
> > +#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 201)
> > +#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 202)
> > +
> > +/*
> > * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
> > * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility
> > * with the legacy v1 API.The number range is out of range by purpose:
>
> Looks OK to me.
>
> This won't apply anymore on master, because we changed the numberspace,
> but it is a trivial conflict. No need to rebase.
>
> Takashi,
>
> If OK for you, please ack.
Acked-by: Takashi Iwai <tiwai@...e.de>
Takashi
Powered by blists - more mailing lists