diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/video/matrox/matroxfb_crtc2.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/video/matrox/matroxfb_crtc2.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 78414baa5a5..d7112c39614 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include "matroxfb_misc.h" | 15 | #include "matroxfb_misc.h" |
| 16 | #include "matroxfb_DAC1064.h" | 16 | #include "matroxfb_DAC1064.h" |
| 17 | #include <linux/matroxfb.h> | 17 | #include <linux/matroxfb.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/uaccess.h> | 19 | #include <linux/uaccess.h> |
| 19 | 20 | ||
| 20 | /* **************************************************** */ | 21 | /* **************************************************** */ |