diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/video/udlfb.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/video/udlfb.c')
| -rw-r--r-- | drivers/video/udlfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c index 2c8364e9b632..68041d9dc260 100644 --- a/drivers/video/udlfb.c +++ b/drivers/video/udlfb.c | |||
| @@ -769,7 +769,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd, | |||
| 769 | 769 | ||
| 770 | /* | 770 | /* |
| 771 | * If we have a damage-aware client, turn fb_defio "off" | 771 | * If we have a damage-aware client, turn fb_defio "off" |
| 772 | * To avoid perf imact of unecessary page fault handling. | 772 | * To avoid perf imact of unnecessary page fault handling. |
| 773 | * Done by resetting the delay for this fb_info to a very | 773 | * Done by resetting the delay for this fb_info to a very |
| 774 | * long period. Pages will become writable and stay that way. | 774 | * long period. Pages will become writable and stay that way. |
| 775 | * Reset to normal value when all clients have closed this fb. | 775 | * Reset to normal value when all clients have closed this fb. |