diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-17 20:53:52 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-17 20:53:52 -0500 |
| commit | 260af56271f79da0e37faa5a99b1786b221297e5 (patch) | |
| tree | d76a2609f940b88083314d5f9131c73115bd4dcb /include/linux/fb.h | |
| parent | 1dca899e95d27475c9036ce1cf857a72852b9c53 (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index a34bdf5a9d23..de9c722e7b90 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -669,12 +669,6 @@ struct fb_ops { | |||
| 669 | /* perform fb specific mmap */ | 669 | /* perform fb specific mmap */ |
| 670 | int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma); | 670 | int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma); |
| 671 | 671 | ||
| 672 | /* save current hardware state */ | ||
| 673 | void (*fb_save_state)(struct fb_info *info); | ||
| 674 | |||
| 675 | /* restore saved state */ | ||
| 676 | void (*fb_restore_state)(struct fb_info *info); | ||
| 677 | |||
| 678 | /* get capability given var */ | 672 | /* get capability given var */ |
| 679 | void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps, | 673 | void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps, |
| 680 | struct fb_var_screeninfo *var); | 674 | struct fb_var_screeninfo *var); |
