diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/video/neofb.c | |
parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
download | talos-op-linux-23dd64011285010ac291f7dddf6e287bdb43a0ad.tar.gz talos-op-linux-23dd64011285010ac291f7dddf6e287bdb43a0ad.zip |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/neofb.c')
-rw-r--r-- | drivers/video/neofb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c index a2e201dc40f7..b961d5601bd9 100644 --- a/drivers/video/neofb.c +++ b/drivers/video/neofb.c @@ -486,10 +486,8 @@ static void vgaHWRestore(const struct fb_info *info, static inline int neo2200_sync(struct fb_info *info) { struct neofb_par *par = info->par; - int waitcycles; - while (readl(&par->neo2200->bltStat) & 1) - waitcycles++; + while (readl(&par->neo2200->bltStat) & 1); return 0; } |