diff options
| author | Anatolij Gustschin <agust@denx.de> | 2013-03-29 13:54:10 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-03-29 13:54:10 +0100 |
| commit | d0f34f10f14853ebe3f75371533708aa0639d830 (patch) | |
| tree | 5e6bf57ff36e9e52c1a3d78a083883eca73978c4 /api | |
| parent | 009d75ccc11d27b9a083375a88bb93cb746b4800 (diff) | |
| parent | acf3baad23586bcaf9af608b8c31949ab54e8338 (diff) | |
Merge branch 'for-v2013.04'
Conflicts:
drivers/video/Makefile
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'api')
| -rw-r--r-- | api/api_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/api_display.c b/api/api_display.c index 643917088f..c167db7b14 100644 --- a/api/api_display.c +++ b/api/api_display.c @@ -45,8 +45,8 @@ int display_get_info(int type, struct display_info *di) case DISPLAY_TYPE_LCD: di->pixel_width = panel_info.vl_col; di->pixel_height = panel_info.vl_row; - di->screen_rows = CONSOLE_ROWS; - di->screen_cols = CONSOLE_COLS; + di->screen_rows = lcd_get_screen_rows(); + di->screen_cols = lcd_get_screen_columns(); break; #endif } |