diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 12:34:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 12:34:40 -0500 |
| commit | eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5 (patch) | |
| tree | 34f7d08d5f9913c3b5c3bca152953a173ded1e05 /include/linux/fb.h | |
| parent | 02412f49f6a7e35753d9af49d92662fb562fc9fa (diff) | |
| parent | df11303c90406426847255ba498607f15a472a0a (diff) | |
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
Fix toogle whether xenbus driver should be built as module or part of kernel.
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index de9c722e7b90..369767bd873e 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -763,6 +763,7 @@ struct fb_tile_ops { | |||
| 763 | * takes over; acceleration engine should be in a quiescent state */ | 763 | * takes over; acceleration engine should be in a quiescent state */ |
| 764 | 764 | ||
| 765 | /* hints */ | 765 | /* hints */ |
| 766 | #define FBINFO_VIRTFB 0x0004 /* FB is System RAM, not device. */ | ||
| 766 | #define FBINFO_PARTIAL_PAN_OK 0x0040 /* otw use pan only for double-buffering */ | 767 | #define FBINFO_PARTIAL_PAN_OK 0x0040 /* otw use pan only for double-buffering */ |
| 767 | #define FBINFO_READS_FAST 0x0080 /* soft-copy faster than rendering */ | 768 | #define FBINFO_READS_FAST 0x0080 /* soft-copy faster than rendering */ |
| 768 | 769 | ||