diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 19:59:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 19:59:55 -0400 |
| commit | c94c0d201f1c1a62184f4f220c1615347aafbee7 (patch) | |
| tree | ac2fe13e5686091ab9c3789cb40d50371ca270ef /include/asm-arm/arch-imx/imxfb.h | |
| parent | 8ed693d29b25bbd88471ec043cc01581419d0481 (diff) | |
| parent | 53776eb4acdd3ec576d75b61b656ef8d51e430ea (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-imx/imxfb.h')
| -rw-r--r-- | include/asm-arm/arch-imx/imxfb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-imx/imxfb.h b/include/asm-arm/arch-imx/imxfb.h index 2346d454ab9c..7dbc7bbba65d 100644 --- a/include/asm-arm/arch-imx/imxfb.h +++ b/include/asm-arm/arch-imx/imxfb.h | |||
| @@ -25,6 +25,7 @@ struct imxfb_mach_info { | |||
| 25 | u_int pcr; | 25 | u_int pcr; |
| 26 | u_int pwmr; | 26 | u_int pwmr; |
| 27 | u_int lscr1; | 27 | u_int lscr1; |
| 28 | u_int dmacr; | ||
| 28 | 29 | ||
| 29 | u_char * fixed_screen_cpu; | 30 | u_char * fixed_screen_cpu; |
| 30 | dma_addr_t fixed_screen_dma; | 31 | dma_addr_t fixed_screen_dma; |