diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /include/asm-arm/arch-pxa/pxafb.h | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
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; |