Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27472
b: refs/heads/master
c: 3aff13c
h: refs/heads/master
v: v3
  • Loading branch information
Dave Airlie committed Apr 3, 2006
1 parent 11f1bb6 commit bb49541
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 85 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 46f60b8e67e6fceede851dc69cdee2d7c0de27b9
refs/heads/master: 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e
2 changes: 1 addition & 1 deletion trunk/drivers/video/intelfb/intelfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ struct intelfb_info {
int pll_index;
};

#define IS_I9xx(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))
#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))

/*** function prototypes ***/

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/intelfb/intelfbdrv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
intelfbhw_cursor_hide(dinfo);

/* If XFree killed the cursor - restore it */
physical = (dinfo->mobile || IS_I9xx(dinfo)) ? dinfo->cursor.physical :
physical = (dinfo->mobile || IS_I9XX(dinfo)) ? dinfo->cursor.physical :
(dinfo->cursor.offset << 12);

if (INREG(CURSOR_A_BASEADDR) != physical) {
Expand Down
Loading

0 comments on commit bb49541

Please sign in to comment.