diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/video/matrox/matroxfb_base.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 7064fb4427b6..052dd9f0b760 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
| @@ -113,6 +113,7 @@ | |||
| 113 | #include "matroxfb_g450.h" | 113 | #include "matroxfb_g450.h" |
| 114 | #include <linux/matroxfb.h> | 114 | #include <linux/matroxfb.h> |
| 115 | #include <linux/interrupt.h> | 115 | #include <linux/interrupt.h> |
| 116 | #include <linux/slab.h> | ||
| 116 | #include <linux/uaccess.h> | 117 | #include <linux/uaccess.h> |
| 117 | 118 | ||
| 118 | #ifdef CONFIG_PPC_PMAC | 119 | #ifdef CONFIG_PPC_PMAC |