diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2007-03-20 11:34:40 +0800 |
|---|---|---|
| committer | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2007-03-20 11:34:40 +0800 |
| commit | 0a612e7115ff993bb8e9a00df13c0b0d20122fd6 (patch) | |
| tree | 30cdce5d6cae50261e72cbd26bf81ff0ccda5e21 /src/common.h | |
| parent | 8bb677889d3f71cde671f17a3589939acad2c3b3 (diff) | |
| parent | 4c4faf260eb4dad1b1919c6168fa9ef477b98a39 (diff) | |
Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
Conflicts:
src/i830_display.c
Change LVDS output and postread like upstream. This might
need to be retested on 965GM LVDS.
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common.h b/src/common.h index fa2a197b..f299e5dc 100644 --- a/src/common.h +++ b/src/common.h @@ -87,7 +87,6 @@ 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[]; @@ -234,6 +233,7 @@ union intfloat { #define INREG8(addr) *(volatile CARD8 *)(RecPtr->MMIOBase + (addr)) #define INREG16(addr) *(volatile CARD16 *)(RecPtr->MMIOBase + (addr)) #define INREG(addr) *(volatile CARD32 *)(RecPtr->MMIOBase + (addr)) +#define POSTING_READ(addr) (void)INREG(addr) #define OUTREG8(addr, val) do { \ *(volatile CARD8 *)(RecPtr->MMIOBase + (addr)) = (val); \ |