diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /include/asm-arm/arch-imx | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/arch-imx')
| -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; |