| Message ID | 1461269857-12813-20-git-send-email-emil.l.velikov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 21, 2016 at 09:17:32PM +0100, Emil Velikov wrote: > Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> If the extern C stuff falls through, maybe we want to pull this one out ahead? -Daniel > --- > include/uapi/drm/sis_drm.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h > index 3f7d8ca..3e3f7e9 100644 > --- a/include/uapi/drm/sis_drm.h > +++ b/include/uapi/drm/sis_drm.h > @@ -27,6 +27,8 @@ > #ifndef __SIS_DRM_H__ > #define __SIS_DRM_H__ > > +#include "drm.h" > + > #if defined(__cplusplus) > extern "C" { > #endif > -- > 2.6.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On 22 April 2016 at 18:37, Daniel Vetter <daniel@ffwll.ch> wrote: > On Thu, Apr 21, 2016 at 09:17:32PM +0100, Emil Velikov wrote: >> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> > > If the extern C stuff falls through, maybe we want to pull this one out > ahead? I've pulled this and the qxl one into -next as I was driving past. Dave.
On 27 April 2016 at 00:37, Dave Airlie <airlied@gmail.com> wrote: > On 22 April 2016 at 18:37, Daniel Vetter <daniel@ffwll.ch> wrote: >> On Thu, Apr 21, 2016 at 09:17:32PM +0100, Emil Velikov wrote: >>> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> >> >> If the extern C stuff falls through, maybe we want to pull this one out >> ahead? > > I've pulled this and the qxl one into -next as I was driving past. > Nice one. Thanks Dave. -Emil
diff --git a/include/uapi/drm/sis_drm.h b/include/uapi/drm/sis_drm.h index 3f7d8ca..3e3f7e9 100644 --- a/include/uapi/drm/sis_drm.h +++ b/include/uapi/drm/sis_drm.h @@ -27,6 +27,8 @@ #ifndef __SIS_DRM_H__ #define __SIS_DRM_H__ +#include "drm.h" + #if defined(__cplusplus) extern "C" { #endif
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- include/uapi/drm/sis_drm.h | 2 ++ 1 file changed, 2 insertions(+)