diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 16:59:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 16:59:55 -0700 |
| commit | c94c0d201f1c1a62184f4f220c1615347aafbee7 (patch) | |
| tree | ac2fe13e5686091ab9c3789cb40d50371ca270ef /include | |
| parent | 8ed693d29b25bbd88471ec043cc01581419d0481 (diff) | |
| parent | 53776eb4acdd3ec576d75b61b656ef8d51e430ea (diff) | |
| download | kernel_replicant_linux-c94c0d201f1c1a62184f4f220c1615347aafbee7.tar.gz kernel_replicant_linux-c94c0d201f1c1a62184f4f220c1615347aafbee7.tar.bz2 kernel_replicant_linux-c94c0d201f1c1a62184f4f220c1615347aafbee7.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -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 { u_int pcr; u_int pwmr; u_int lscr1; + u_int dmacr; u_char * fixed_screen_cpu; dma_addr_t fixed_screen_dma; |