diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fb.h | 7 | ||||
-rw-r--r-- | include/linux/fbcon.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index f52ef0ad6781..288175fafaf6 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -136,10 +136,13 @@ struct fb_cursor_user { | |||
136 | #define FB_EVENT_RESUME 0x03 | 136 | #define FB_EVENT_RESUME 0x03 |
137 | /* An entry from the modelist was removed */ | 137 | /* An entry from the modelist was removed */ |
138 | #define FB_EVENT_MODE_DELETE 0x04 | 138 | #define FB_EVENT_MODE_DELETE 0x04 |
139 | /* A driver registered itself */ | 139 | |
140 | #ifdef CONFIG_GUMSTIX_AM200EPD | ||
141 | /* only used by mach-pxa/am200epd.c */ | ||
140 | #define FB_EVENT_FB_REGISTERED 0x05 | 142 | #define FB_EVENT_FB_REGISTERED 0x05 |
141 | /* A driver unregistered itself */ | ||
142 | #define FB_EVENT_FB_UNREGISTERED 0x06 | 143 | #define FB_EVENT_FB_UNREGISTERED 0x06 |
144 | #endif | ||
145 | |||
143 | /* CONSOLE-SPECIFIC: get console to framebuffer mapping */ | 146 | /* CONSOLE-SPECIFIC: get console to framebuffer mapping */ |
144 | #define FB_EVENT_GET_CONSOLE_MAP 0x07 | 147 | #define FB_EVENT_GET_CONSOLE_MAP 0x07 |
145 | /* CONSOLE-SPECIFIC: set console to framebuffer mapping */ | 148 | /* CONSOLE-SPECIFIC: set console to framebuffer mapping */ |
diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h index f68a7db14165..94a71e9e1257 100644 --- a/include/linux/fbcon.h +++ b/include/linux/fbcon.h | |||
@@ -4,9 +4,13 @@ | |||
4 | #ifdef CONFIG_FRAMEBUFFER_CONSOLE | 4 | #ifdef CONFIG_FRAMEBUFFER_CONSOLE |
5 | void __init fb_console_init(void); | 5 | void __init fb_console_init(void); |
6 | void __exit fb_console_exit(void); | 6 | void __exit fb_console_exit(void); |
7 | int fbcon_fb_registered(struct fb_info *info); | ||
8 | void fbcon_fb_unregistered(struct fb_info *info); | ||
7 | #else | 9 | #else |
8 | static inline void fb_console_init(void) {} | 10 | static inline void fb_console_init(void) {} |
9 | static inline void fb_console_exit(void) {} | 11 | static inline void fb_console_exit(void) {} |
12 | static inline int fbcon_fb_registered(struct fb_info *info) { return 0; } | ||
13 | static inline void fbcon_fb_unregistered(struct fb_info *info) {} | ||
10 | #endif | 14 | #endif |
11 | 15 | ||
12 | #endif /* _LINUX_FBCON_H */ | 16 | #endif /* _LINUX_FBCON_H */ |