diff mbox

[v4,09/79] via_drm.h: don't include non-existing via_drmclient.h

Message ID 1444888618-4506-10-git-send-email-mikko.rapeli@iki.fi (mailing list archive)
State New, archived
Headers show

Commit Message

Mikko Rapeli Oct. 15, 2015, 5:55 a.m. UTC
Fixes compiler error:

drm/via_drm.h:36:27: fatal error: via_drmclient.h: No such file or directory

Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
---
 include/uapi/drm/via_drm.h | 3 ---
 1 file changed, 3 deletions(-)

Comments

Emil Velikov Oct. 21, 2015, 3:01 p.m. UTC | #1
On 15 October 2015 at 06:55, Mikko Rapeli <mikko.rapeli@iki.fi> wrote:
> Fixes compiler error:
>
> drm/via_drm.h:36:27: fatal error: via_drmclient.h: No such file or directory
>
> Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
> ---
>  include/uapi/drm/via_drm.h | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h
> index 8b0533c..d19c0e2 100644
> --- a/include/uapi/drm/via_drm.h
> +++ b/include/uapi/drm/via_drm.h
> @@ -33,9 +33,6 @@
>  #ifndef _VIA_DEFINES_
>  #define _VIA_DEFINES_
>
> -#ifndef __KERNEL__
> -#include "via_drmclient.h"
> -#endif
>
Now this one is messy. If we remove it, existing userspace [0] won't
be able to build. As they don't include the above header where needed,
but instead rely on via_drm.h. Despite the fact that each user
provides its own copy of via_drmclient.h.
There is some very old hardware/software involved so I'm not sure how
much of a real issue this patch will be. If the maintainers decide to
pick it up, let me know and I'll roll a fix for the ddx.

-Emil

[0] There are two users afaict - the via dri mesa module and
xf86-video-via. With the former nuked some 5 years ago with mesa
commit e4344161bde2e24fcfba65d30d58f087bd8bf94d
diff mbox

Patch

diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h
index 8b0533c..d19c0e2 100644
--- a/include/uapi/drm/via_drm.h
+++ b/include/uapi/drm/via_drm.h
@@ -33,9 +33,6 @@ 
 #ifndef _VIA_DEFINES_
 #define _VIA_DEFINES_
 
-#ifndef __KERNEL__
-#include "via_drmclient.h"
-#endif
 
 #define VIA_NR_SAREA_CLIPRECTS		8
 #define VIA_NR_XVMC_PORTS               10