[Nouveau] [PATCH 2/2] nouveau: Fix compile error due to bad include

[Emil Velikov]

On 18 September 2016 at 11:21, Karol Herbst <karolherbst at gmail.com> wrote:
> Cought while working on travis-ci integration
>
> Signed-off-by: Karol Herbst <karolherbst at gmail.com>
> ---
>  drm/nouveau/uapi/drm/nouveau_drm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drm/nouveau/uapi/drm/nouveau_drm.h b/drm/nouveau/uapi/drm/nouveau_drm.h
> index 259588a..0bfaae8 100644
> --- a/drm/nouveau/uapi/drm/nouveau_drm.h
> +++ b/drm/nouveau/uapi/drm/nouveau_drm.h
> @@ -27,7 +27,7 @@
>
>  #define DRM_NOUVEAU_EVENT_NVIF                                       0x80000000
>
> -#include "drm.h"
> +#include "drm/drm.h"
>
Afaict this is a side effect of an "incomplete sync" with the kernel
code. In there we have the respective header alongside the
nouveau_drm.h one.

One workaround is to track drm.h in the nouveau repo, with another to
adjust KBUILD_OPTS to honour the upstream one.

KBUILD_OPTS += KCPPFLAGS="-I$(LINUXDIR)/include/uapi/drm"

The above (untested) sounds like the better solution imho.

Regards,
Emil