diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:05:50 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:05:50 -0400 |
| commit | 698158c799c7961824ccdb773250e16c0dd5d9e4 (patch) | |
| tree | 96f034be9e9a95e6f68b5d20d1a3df7a3cbf724a /include/asm-arm/arch-pxa/pxafb.h | |
| parent | 4c7827eec78abe6fe68fd29305806467f2a51e63 (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-arm/arch-pxa/pxafb.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxafb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h index bbd22396841a..daf018d0c604 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/include/asm-arm/arch-pxa/pxafb.h | |||
| @@ -71,7 +71,8 @@ struct pxafb_mode_info { | |||
| 71 | 71 | ||
| 72 | u_char bpp; | 72 | u_char bpp; |
| 73 | u_int cmap_greyscale:1, | 73 | u_int cmap_greyscale:1, |
| 74 | unused:31; | 74 | depth:8, |
| 75 | unused:23; | ||
| 75 | 76 | ||
| 76 | /* Parallel Mode Timing */ | 77 | /* Parallel Mode Timing */ |
| 77 | u_char hsync_len; | 78 | u_char hsync_len; |