diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-08 18:41:25 +0200 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-08 18:41:25 +0200 |
| commit | 76670f665ebec7cdf40a04bf9379cb3ad4417507 (patch) | |
| tree | d108b86148b961e95ab44879f3eb024e5dfe5977 /src/atipreinit.c | |
| parent | 83f81ed5e3c33c94c80500316c37a7cbfc51f41f (diff) | |
| parent | a3ee42207aab77d93655a82fdcb32be38268b85f (diff) | |
Merge branch 'master' into randr-1.2 and fix conflicts
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index e18e27a..d960e88 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -32,20 +32,21 @@ #include "atiaudio.h" #include "atibus.h" #include "atichip.h" -#include "aticonfig.h" #include "aticursor.h" #include "atidac.h" #include "atidsp.h" #include "atii2c.h" -#include "atiident.h" #include "atiload.h" #include "atilock.h" #include "atimach64.h" #include "atimach64accel.h" #include "atimach64io.h" +#include "atimach64probe.h" #include "atimode.h" +#include "atioption.h" #include "atipreinit.h" #include "atiprint.h" +#include "atiprobe.h" #include "atividmem.h" #include "atiwonderio.h" #include "atixv.h" @@ -146,7 +147,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, @@ -982,7 +983,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", |