diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-05-22 10:42:24 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-05-22 10:42:24 -0700 |
| commit | c1c46f882f9a11c383c8d1d1ce393be8fda55ed0 (patch) | |
| tree | 6272cf9017a205eea2f6005b1970d20c87f301da /src/common.h | |
| parent | 1e2da2450d7213c0aa4d4bd1fba5723dcda13ddf (diff) | |
| parent | f2967a2f5f47b636b2445fa69dbc3ec79e065c90 (diff) | |
Merge branch 'master' into modesetting
Conflicts:
man/.gitignore
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common.h b/src/common.h index 6e68767a..21977af4 100644 --- a/src/common.h +++ b/src/common.h @@ -80,10 +80,10 @@ extern const char *I810ddcSymbols[]; extern const char *I810fbSymbols[]; extern const char *I810xaaSymbols[]; extern const char *I810shadowFBSymbols[]; +extern const char *I810shadowSymbols[]; #ifdef XF86DRI extern const char *I810driSymbols[]; extern const char *I810drmSymbols[]; -extern const char *I810shadowSymbols[]; #endif extern const char *I810i2cSymbols[]; @@ -132,7 +132,7 @@ extern void I830DPRINTF_stub(const char *filename, int line, RecPtr->LpRing->space -= ringused; \ if (outring & 0x07) \ ErrorF("ADVANCE_LP_RING: " \ - "outring (0x%x) isn't on a QWord boundary", outring); \ + "outring (0x%x) isn't on a QWord boundary\n", outring); \ OUTREG(LP_RING + RING_TAIL, outring); \ } while (0) |