diff options
| author | Albert Pool <albertpool@solcon.nl> | 2013-06-16 21:39:26 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2013-06-16 21:39:26 +0300 |
| commit | 8241873a3f098cd8f59c2657fcea843120ed2c1a (patch) | |
| tree | c779c3913348d93565edcf87c54efb742ec2b266 | |
| parent | 9405497c0c918148b272add62f5495b2320658e7 (diff) | |
nouveau/makefile: follow upstream changes
DRM user space headers have moved from include/drm to include/uapi/drm.
Disable new DRM drivers mgag200, gma500, and udl.
[pq: wrote commit message]
Signed-off-by: Pekka Paalanen <pq@iki.fi>
| -rw-r--r-- | nouveau/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nouveau/Makefile b/nouveau/Makefile index 0a37e33d1564..11a59c324cfd 100644 --- a/nouveau/Makefile +++ b/nouveau/Makefile @@ -1,6 +1,7 @@ # This Makefile is loosely based on the drm.git/linux-core/Makefile and # the preliminary work by Christopher James Halse Rogers. # Edited by Pekka Paalanen <pq@iki.fi> +# Edited by Albert Pool <albertpool@solcon.nl> # By default, the build is done against the running linux kernel source. # To build against a different kernel source tree, set LINUXDIR: @@ -29,10 +30,10 @@ endif NOUVEAUGITREMOTE ?= origin NOUVEAUROOTDIR ?= $(CURDIR)/.. override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) -HEADERINSDIR ?= $(NOUVEAUROOTDIR)/usr/include/drm +HEADERINSDIR ?= $(NOUVEAUROOTDIR)/usr/include/uapi/drm override HEADERINSDIR := $(abspath $(HEADERINSDIR)) -TESTFILE := include/drm/nouveau_drm.h +TESTFILE := include/uapi/drm/nouveau_drm.h ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) $(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ please set NOUVEAUROOTDIR) @@ -41,7 +42,7 @@ endif GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ git describe --always --abbrev=17 2> /dev/null) -DRMINC := $(NOUVEAUROOTDIR)/include/drm +DRMINC := $(NOUVEAUROOTDIR)/include/uapi/drm DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm DRMCFG := \ CONFIG_DRM=m \ @@ -57,11 +58,14 @@ DRMCFG := \ CONFIG_DRM_R128=n \ CONFIG_DRM_RADEON=n \ CONFIG_DRM_MGA=n \ + CONFIG_DRM_MGAG200=n \ CONFIG_DRM_I810=n \ CONFIG_DRM_I830=n \ CONFIG_DRM_I915=n \ + CONFIG_DRM_GMA500=n \ CONFIG_DRM_SIS=n \ CONFIG_DRM_SAVAGE=n \ + CONFIG_DRM_UDL=n \ CONFIG_DRM_VIA=n \ CONFIG_DRM_VMWGFX=n |