aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-23 16:59:55 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-23 16:59:55 -0700
commitc94c0d201f1c1a62184f4f220c1615347aafbee7 (patch)
treeac2fe13e5686091ab9c3789cb40d50371ca270ef /include
parent8ed693d29b25bbd88471ec043cc01581419d0481 (diff)
parent53776eb4acdd3ec576d75b61b656ef8d51e430ea (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-imx/imxfb.h1
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 2346d454ab9..7dbc7bbba65 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;