diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 10:11:27 -0400 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 10:11:27 -0400 |
| commit | 8f987768eb99631374f4ab0bb19cd062baf1397d (patch) | |
| tree | b89aa5c207f7ba6a688f45657424b937f17ceb8a /include/linux/amba/clcd.h | |
| parent | 63f7526f26f0a9291ac3f7a986aa18ebfb61ec19 (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'include/linux/amba/clcd.h')
| -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 ca16c3801a1e..be33b3affc8a 100644 --- a/include/linux/amba/clcd.h +++ b/include/linux/amba/clcd.h | |||
| @@ -150,6 +150,7 @@ struct clcd_fb { | |||
| 150 | u16 off_cntl; | 150 | u16 off_cntl; |
| 151 | u32 clcd_cntl; | 151 | u32 clcd_cntl; |
| 152 | u32 cmap[16]; | 152 | u32 cmap[16]; |
| 153 | bool clk_enabled; | ||
| 153 | }; | 154 | }; |
| 154 | 155 | ||
| 155 | static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) | 156 | static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs) |