diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-07-11 11:23:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 11:23:41 +1000 |
| commit | 2c9e05cf4c6eb18c941321f764ed1b282a314ba9 (patch) | |
| tree | d5bcbe9114fac7e03549ae05a9e6dffc793fcbaf /linux-core/Makefile | |
| parent | 9b9a127ed0fe9a6a8e2fde84739ccff6fa0bc5ac (diff) | |
| parent | 694e1c5c3f768436651ddf95e11ab5a89ccc8ffa (diff) | |
Merge branch 'master' into cleanup
Conflicts:
libdrm/xf86drm.c
linux-core/drm_bo.c
linux-core/drm_fence.c
Diffstat (limited to 'linux-core/Makefile')
| -rw-r--r-- | linux-core/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index af29bd6a..1758777c 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -283,6 +283,7 @@ CONFIG_DRM_SAVAGE := n CONFIG_DRM_VIA := n CONFIG_DRM_MACH64 := n CONFIG_DRM_NV := n +CONFIG_DRM_NOUVEAU := n # Enable module builds for the modules requested/supported. |