summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-03-04 10:26:59 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-03-17 09:45:12 +1000
commit0c9f044cac662d303793d9602cf9a899777f3104 (patch)
tree00942a3a552be1377733ad24a26fc24e00c1e196
parentc819d5991e0cd0eee2e7210e0a5ac48433c58d20 (diff)
downloadnouveau-0c9f044cac662d303793d9602cf9a899777f3104.tar.gz
drm: move uapi so it gets picked before copy in linux tree
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/uapi/drm/nouveau_drm.h (renamed from drm/nouveau/include/uapi/drm/nouveau_drm.h)0
-rw-r--r--lib/Makefile2
2 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/include/uapi/drm/nouveau_drm.h b/drm/nouveau/uapi/drm/nouveau_drm.h
index 5507eead5..5507eead5 100644
--- a/drm/nouveau/include/uapi/drm/nouveau_drm.h
+++ b/drm/nouveau/uapi/drm/nouveau_drm.h
diff --git a/lib/Makefile b/lib/Makefile
index b3b9ddb06..82706f872 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-LIBNVIF_CC := $(CFLAGS) -fPIC
+LIBNVIF_CC := $(CFLAGS) -I$(drm) -fPIC
LIBNVIF_LD := $(LDFLAGS) -shared -lpciaccess -lpthread -ldrm
src := $(drm)