diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 13:42:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 13:42:36 -0400 |
| commit | df43938bc581f831b80b14ae249078e8da3d6ef5 (patch) | |
| tree | 544a9ae62e208a70cca56b5e3cb724b798eec681 /include | |
| parent | 49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd (diff) | |
| parent | c47747fde931c02455683bd00ea43eaa62f35b0e (diff) | |
Merge branch 'fbmem'
* fbmem:
fbmem: make read/write/ioctl use the frame buffer at open time
fbcon: add lifetime refcount to opened frame buffers
Diffstat (limited to 'include')
| -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 df728c1c29ed..6a8274877171 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -832,6 +832,7 @@ struct fb_tile_ops { | |||
| 832 | #define FBINFO_CAN_FORCE_OUTPUT 0x200000 | 832 | #define FBINFO_CAN_FORCE_OUTPUT 0x200000 |
| 833 | 833 | ||
| 834 | struct fb_info { | 834 | struct fb_info { |
| 835 | atomic_t count; | ||
| 835 | int node; | 836 | int node; |
| 836 | int flags; | 837 | int flags; |
| 837 | struct mutex lock; /* Lock for open/release/ioctl funcs */ | 838 | struct mutex lock; /* Lock for open/release/ioctl funcs */ |