diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
| commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
| tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /include/linux/fb.h | |
| parent | 623eb15647fc35c5a8cd38985d5958240eb072c1 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 e154a79b8322..68ba85a00c06 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -1124,6 +1124,7 @@ extern const struct fb_videomode *fb_find_best_display(const struct fb_monspecs | |||
| 1124 | 1124 | ||
| 1125 | /* drivers/video/fbcmap.c */ | 1125 | /* drivers/video/fbcmap.c */ |
| 1126 | extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); | 1126 | extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); |
| 1127 | extern int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags); | ||
| 1127 | extern void fb_dealloc_cmap(struct fb_cmap *cmap); | 1128 | extern void fb_dealloc_cmap(struct fb_cmap *cmap); |
| 1128 | extern int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to); | 1129 | extern int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to); |
| 1129 | extern int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to); | 1130 | extern int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to); |