diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /include/linux/fb.h | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 56a0f03b6..2f8013318 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -221,6 +221,7 @@ extern int GET_FB_IDX(kdev_t rdev); #include <linux/fs.h> #include <linux/init.h> +#include <linux/devfs_fs_kernel.h> struct fb_info; @@ -277,6 +278,8 @@ struct fb_info { struct display *disp; /* initial display variable */ struct vc_data *display_fg; /* Console visible on this display */ char fontname[40]; /* default font name */ + devfs_handle_t devfs_handle; /* Devfs handle for new name */ + devfs_handle_t devfs_lhandle; /* Devfs handle for compat. symlink */ int (*changevar)(int); /* tell console var has changed */ int (*switch_con)(int, struct fb_info*); /* tell fb to switch consoles */ @@ -371,7 +374,7 @@ extern void fbgen_blank(int blank, struct fb_info *info); /* drivers/video/fbmem.c */ extern int register_framebuffer(struct fb_info *fb_info); -extern int unregister_framebuffer(const struct fb_info *fb_info); +extern int unregister_framebuffer(struct fb_info *fb_info); extern int num_registered_fb; extern struct fb_info *registered_fb[FB_MAX]; |