diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-01-04 15:15:07 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-01-04 15:15:07 +1000 |
| commit | 4c4beaf628c9c5dd531605e40696ed31db0e97b8 (patch) | |
| tree | 2eccd0388c87ba06674fb5001b72777ff0b83211 /src/mga_merge.c | |
| parent | 9223c44a731f48c66c226eb88dcb6f9d574cb599 (diff) | |
Untangle XF86DRI from the driver-specific DRI define
XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
itself does exactly nothing other than not fill in the CFLAGS
and thus stop the driver from compiling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/mga_merge.c')
| -rw-r--r-- | src/mga_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c index aec3443..f355f76 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -316,7 +316,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) pMga->Chipset = pMga1->Chipset; pMga->ChipRev = pMga1->ChipRev; -#ifdef XF86DRI +#ifdef MGADRI pMga->agpMode = pMga1->agpMode; #endif |