diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /include/video/sisfb.h | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'include/video/sisfb.h')
| -rw-r--r-- | include/video/sisfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/sisfb.h b/include/video/sisfb.h index fdd74f1a6791..6dc5df9e43f3 100644 --- a/include/video/sisfb.h +++ b/include/video/sisfb.h | |||
| @@ -151,7 +151,7 @@ struct sisfb_cmd { | |||
| 151 | __u32 sisfb_result[4]; | 151 | __u32 sisfb_result[4]; |
| 152 | }; | 152 | }; |
| 153 | 153 | ||
| 154 | /* Addtional IOCTLs for communication sisfb <> X driver */ | 154 | /* Additional IOCTLs for communication sisfb <> X driver */ |
| 155 | /* If changing this, vgatypes.h must also be changed (for X driver) */ | 155 | /* If changing this, vgatypes.h must also be changed (for X driver) */ |
| 156 | 156 | ||
| 157 | /* ioctl for identifying and giving some info (esp. memory heap start) */ | 157 | /* ioctl for identifying and giving some info (esp. memory heap start) */ |