diff options
author | Dave Airlie <airlied@linux.ie> | 2006-03-23 03:23:48 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-04-02 21:43:28 -0400 |
commit | 8b91b0b4f2d731b92f59bc82492769a09b4955a6 (patch) | |
tree | aeb384e59229d4814733195db5836ad9ab448c17 /drivers/video/intelfb/intelfbdrv.c | |
parent | 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 (diff) |
intelfb: fixup whitespace..
repeat after me, I must not take code from X without reformatting...
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index b96001b5d947..f659ca8d1652 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -1467,7 +1467,7 @@ static int | |||
1467 | intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor) | 1467 | intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor) |
1468 | { | 1468 | { |
1469 | struct intelfb_info *dinfo = GET_DINFO(info); | 1469 | struct intelfb_info *dinfo = GET_DINFO(info); |
1470 | int ret; | 1470 | u32 physical; |
1471 | #if VERBOSE > 0 | 1471 | #if VERBOSE > 0 |
1472 | DBG_MSG("intelfb_cursor\n"); | 1472 | DBG_MSG("intelfb_cursor\n"); |
1473 | #endif | 1473 | #endif |
@@ -1478,12 +1478,10 @@ intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor) | |||
1478 | intelfbhw_cursor_hide(dinfo); | 1478 | intelfbhw_cursor_hide(dinfo); |
1479 | 1479 | ||
1480 | /* If XFree killed the cursor - restore it */ | 1480 | /* If XFree killed the cursor - restore it */ |
1481 | if (dinfo->mobile || IS_I9xx(dinfo)) | 1481 | physical = (dinfo->mobile || IS_I9xx(dinfo)) ? dinfo->cursor.physical : |
1482 | ret = (INREG(CURSOR_A_BASEADDR) != dinfo->cursor.physical); | 1482 | (dinfo->cursor.offset << 12); |
1483 | else | ||
1484 | ret = (INREG(CURSOR_A_BASEADDR) != dinfo->cursor.offset << 12); | ||
1485 | 1483 | ||
1486 | if (ret) { | 1484 | if (INREG(CURSOR_A_BASEADDR) != physical) { |
1487 | u32 fg, bg; | 1485 | u32 fg, bg; |
1488 | 1486 | ||
1489 | DBG_MSG("the cursor was killed - restore it !!\n"); | 1487 | DBG_MSG("the cursor was killed - restore it !!\n"); |