Merge branch 'master' of git://git.denx.de/u-boot-x86

[karo-tx-uboot.git] / drivers / video / videomodes.h

diff --git a/drivers/video/videomodes.h b/drivers/video/videomodes.h
index e2dffe7fed51342b5422b79ec1c7a8ac46fe7c90..e546ab44f17f93ffc110ca365662fadcb2ade89e 100644 (file)
--- a/drivers/video/videomodes.h
+++ b/drivers/video/videomodes.h
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef CFG_DEFAULT_VIDEO_MODE
-#define CFG_DEFAULT_VIDEO_MODE 0x301
+#ifndef CONFIG_SYS_DEFAULT_VIDEO_MODE
+#define CONFIG_SYS_DEFAULT_VIDEO_MODE  0x301
 #endif
 
 /* Some mode definitions */
@@ -86,3 +86,6 @@ extern const struct ctfb_vesa_modes vesa_modes[];
 extern const struct ctfb_res_modes res_mode_init[];
 
 int video_get_params (struct ctfb_res_modes *pPar, char *penv);
+
+int video_get_video_mode(unsigned int *xres, unsigned int *yres,
+       unsigned int *depth, unsigned int *freq, const char **options);