diff options
| author | Matthew Garrett <mjg59@srcf.ucam.org> | 2007-09-13 02:50:55 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg59@srcf.ucam.org> | 2007-09-13 02:50:55 +0100 |
| commit | 9d8ffbc5372bea4e1d139a32ac6f7c7fb1aad869 (patch) | |
| tree | 0e63798006279c3a2da04059b45e8e11c8d6994d | |
| parent | 97b73f041c501404325708b3223149fb1d7cd018 (diff) | |
Avoid having multiple defines with the same name, as it tends to cause things
not to work so well
| -rw-r--r-- | include/radeon_reg.h | 2 | ||||
| -rw-r--r-- | xorg/avivo_output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/radeon_reg.h b/include/radeon_reg.h index e65ead2..239496c 100644 --- a/include/radeon_reg.h +++ b/include/radeon_reg.h @@ -3502,7 +3502,7 @@ # define AVIVO_LVTMA_PWRSEQ_STATE_SYNCEN (1 << 2) # define AVIVO_LVTMA_PWRSEQ_STATE_BLON (1 << 3) # define AVIVO_LVTMA_PWRSEQ_STATE_DONE (1 << 4) -# define AVIVO_LVTMA_PWRSEQ_STATE (8) +# define AVIVO_LVTMA_PWRSEQ_STATE_STATUS (8) #define AVIVO_LVDS_BACKLIGHT_CNTL 0x7af8 # define AVIVO_LVDS_BACKLIGHT_CNTL_EN (1 << 0) diff --git a/xorg/avivo_output.c b/xorg/avivo_output.c index f613395..a78faa8 100644 --- a/xorg/avivo_output.c +++ b/xorg/avivo_output.c @@ -261,7 +261,7 @@ avivo_output_lvds_dpms(xf86OutputPtr output, int mode) do { tmp = INREG(AVIVO_LVTMA_PWRSEQ_STATE); usleep(100); - } while (tmp != 0x8 << AVIVO_LVTMA_PWRSEQ_STATE); + } while (tmp != 0x8 << AVIVO_LVTMA_PWRSEQ_STATE_STATUS); OUTREG(AVIVO_LVTMA_TRANSMITTER_ENABLE, 0); OUTREG(AVIVO_LVTMA_CLOCK_ENABLE, 0); break; |