diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-27 07:40:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 07:40:08 -0400 |
| commit | 15d3b4a26291c170563e2b25ded5de1324f93959 (patch) | |
| tree | 9bea548a7de5215c58a091d58f4eefdb92349f2c /include/asm-arm/arch-pxa/pxafb.h | |
| parent | 2c3abab7c95295f319dc8899b74cbd60140fcdfb (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/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; |