From bc7612fbd2bdc2f4add65994c6239c8655eb35d1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 17 Oct 2008 09:29:14 +1000 Subject: [PATCH] --- yaml --- r: 115731 b: refs/heads/master c: 9e0b97e37fddaf5419d8af24362015ab684eff7e h: refs/heads/master i: 115729: 2170fec53ed5d13dafdfc1dd200394eee0af9eb0 115727: 34a9be106def1059a19b5899505b8035dbc66329 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c1f0e413663..9dc1fc28b375 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edc6f389f6ae9cb7621270a8ddbb1892bd8df125 +refs/heads/master: 9e0b97e37fddaf5419d8af24362015ab684eff7e diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index bf9003ee7aba..9097500de5f4 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/drivers/gpu/drm/Kconfig @@ -6,7 +6,7 @@ # menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" - depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG + depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && SHMEM help Kernel-level support for the Direct Rendering Infrastructure (DRI) introduced in XFree86 4.0. If you say Y here, you need to select