diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/matrox/matroxfb_base.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 |