diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-20 08:04:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-20 08:04:32 +1000 |
| commit | fe2f7a09050fb7a345a1f52239f8f3c4f1053891 (patch) | |
| tree | ee75ebf7f5bfda3a6d621ac42121a3014d80e0aa /src/radeon_driver.c | |
| parent | 744c8cb6c293fcaa687566f52901644e699baace (diff) | |
| parent | 49055d8aff91ff12186feaf5343c8fd2f96bcba0 (diff) | |
Merge branch 'master' into agd-atom-merge
Conflicts:
src/radeon_cursor.c
src/radeon_output.c
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index e5b87e16..55f279bf 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -6428,7 +6428,7 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) #endif /* USE_XAA */ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, - "Disposing cusor info\n"); + "Disposing cursor info\n"); if (info->cursor) xf86DestroyCursorInfoRec(info->cursor); info->cursor = NULL; |