diff options
| author | Antonino Daplas <adaplas@hotpop.com> | 2004-11-07 04:04:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-07 04:04:01 -0800 |
| commit | 94c60aadc32e3ce33c9cebe507bfe674fcd0e8b9 (patch) | |
| tree | 1429645d948dadaed50411d09325c2ed49535a7c /include/linux/fb.h | |
| parent | 1b126bfedc74f25a5873c1b5e288e3a0aa9d6e30 (diff) | |
[PATCH] fbcon/fbdev: Remove fbcon-specific fields from struct fb_info
The following fields in struct fb_info is specific only to fbcon:
- struct timer_ cursor_timer
- int currcon
Remove them from struct fb_info and place them in fbcon_par so they become
invisible from the drivers.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index bd9e42e356d0..d8f4789dce45 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -685,7 +685,6 @@ struct fb_info { struct fb_fix_screeninfo fix; /* Current fix */ struct fb_monspecs monspecs; /* Current Monitor specs */ struct work_struct queue; /* Framebuffer event queue */ - struct timer_list cursor_timer; /* Cursor timer */ struct fb_pixmap pixmap; /* Image hardware mapper */ struct fb_pixmap sprite; /* Cursor hardware mapper */ struct fb_cmap cmap; /* Current cmap */ @@ -697,7 +696,6 @@ struct fb_info { #endif char __iomem *screen_base; /* Virtual address */ unsigned long screen_size; /* Amount of ioremapped VRAM or 0 */ - int currcon; /* Current VC. */ void *pseudo_palette; /* Fake palette of 16 colors */ #define FBINFO_STATE_RUNNING 0 #define FBINFO_STATE_SUSPENDED 1 |