Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / video_fb.h

diff --git a/include/video_fb.h b/include/video_fb.h
index 028e2a6aea4c772846d383ed830183499c0af707..b008853f3098b21ec029e6de52049618f6501b0f 100644 (file)
--- a/include/video_fb.h
+++ b/include/video_fb.h
@@ -18,9 +18,6 @@
 #ifndef _VIDEO_FB_H_
 #define _VIDEO_FB_H_
 
-#define CONSOLE_BG_COL            0x00
-#define CONSOLE_FG_COL            0xa0
-
 /*
  * Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT
  */
@@ -35,7 +32,7 @@
 /* Export Graphic Driver Control                                              */
 /******************************************************************************/
 
-typedef struct {
+typedef struct graphic_device {
     unsigned int isaBase;
     unsigned int pciBase;
     unsigned int dprBase;
@@ -91,9 +88,5 @@ void video_set_lut (
     unsigned char g,              /* green */
     unsigned char b               /* blue */
     );
-#ifdef CONFIG_VIDEO_HW_CURSOR
-void video_set_hw_cursor(int x, int y); /* x y in pixel */
-void video_init_hw_cursor(int font_width, int font_height);
-#endif
 
 #endif /*_VIDEO_FB_H_ */