diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-24 22:56:00 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-24 22:56:00 +0100 |
| commit | 7fe2a9839423a619b5e232646f93ad915ac2029e (patch) | |
| tree | 99542fc4ed267e373a8620b6d2c685c1a6050dfe /include/lcd.h | |
| parent | 89e372cd3d520ed20fab543f2cbba2dbb9490cf8 (diff) | |
| parent | a2bb7105a79af8f2ffa9f87256fce6c1cbcbd8e1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include/lcd.h')
| -rw-r--r-- | include/lcd.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/lcd.h b/include/lcd.h index 512221e9c4..f054cac05f 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -148,14 +148,6 @@ typedef struct vidinfo { extern vidinfo_t panel_info; -#elif defined(CONFIG_MCC200) -typedef struct vidinfo { - ushort vl_col; /* Number of columns (i.e. 160) */ - ushort vl_row; /* Number of rows (i.e. 100) */ - - u_char vl_bpix; /* Bits per pixel, 0 = 1 */ -} vidinfo_t; - #elif defined(CONFIG_ATMEL_LCD) typedef struct vidinfo { @@ -183,6 +175,19 @@ typedef struct vidinfo { extern vidinfo_t panel_info; +#else + +typedef struct vidinfo { + ushort vl_col; /* Number of columns (i.e. 160) */ + ushort vl_row; /* Number of rows (i.e. 100) */ + + u_char vl_bpix; /* Bits per pixel, 0 = 1 */ + + ushort *cmap; /* Pointer to the colormap */ + + void *priv; /* Pointer to driver-specific data */ +} vidinfo_t; + #endif /* CONFIG_MPC823, CONFIG_PXA250 or CONFIG_MCC200 or CONFIG_ATMEL_LCD */ /* Video functions */ |