diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-08-28 16:01:12 +0300 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-08-28 16:01:12 +0300 |
| commit | 7b38d9a1209f87255e5bb0aefe46a363ce4fb6ef (patch) | |
| tree | 981bce7b10ffe6dc3940cada74d558213208b51b /src/atipreinit.c | |
| parent | 2e3d43af1e5077cc61dd8668551a6291368d9ed2 (diff) | |
| parent | 673f799729824f4439dd5f681f75dd5aab50947f (diff) | |
Merge branch 'master' into pci-rework
Conflicts:
src/ati.c
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index 018f2fb1..8114f512 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -41,6 +41,7 @@ #include "atimach64.h" #include "atimach64accel.h" #include "atimach64io.h" +#include "atimach64probe.h" #include "atimode.h" #include "atioption.h" #include "atipreinit.h" @@ -128,7 +129,7 @@ ATIPrintNoiseIfRequested * This function is only called once per screen at the start of the first * server generation. */ -_X_EXPORT Bool +Bool ATIPreInit ( ScrnInfoPtr pScreenInfo, @@ -955,7 +956,8 @@ ATIPreInit /* Report what was found */ xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, - "%s graphics controller detected.\n", ATIChipNames[pATI->Chip]); + "%s graphics controller detected.\n", + xf86TokenToString(Mach64Chipsets, pATI->Chip)); { Message = Buffer + snprintf(Buffer, SizeOf(Buffer), "Chip type %04X", |