diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:11:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-17 18:11:49 -0700 |
| commit | 2a6a432a9ce55876b92f9ea860d7baa05538de16 (patch) | |
| tree | f64431e3f5f105ee350831aef6810281d93e10b1 /include/linux | |
| parent | a7c8962bfbc730a9acc0a635bad0f9628b6e816a (diff) | |
| parent | 99c796df94afca5256860dd4760017f1dbb3480c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: amba clcd: don't disable an already disabled clock
ARM: Tighten check for allowable CPSR values
ARM: 6329/1: wire up sys_accept4() on ARM
ARM: 6328/1: Build with -fno-dwarf2-cfi-asm
ARM: 6326/1: kgdb: fix GDB_MAX_REGS no longer used
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/amba/clcd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h index ca16c3801a1..be33b3affc8 100644 --- a/include/linux/amba/clcd.h +++ b/include/linux/amba/clcd.h @@ -150,6 +150,7 @@ struct clcd_fb { u16 off_cntl; u32 clcd_cntl; u32 cmap[16]; + bool clk_enabled; }; static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) |