git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
[pandora-kernel.git]
/
drivers
/
video
/
matrox
/
matroxfb_crtc2.c
diff --git
a/drivers/video/matrox/matroxfb_crtc2.c
b/drivers/video/matrox/matroxfb_crtc2.c
index
4b3344e
..
a6ab5b6
100644
(file)
--- a/
drivers/video/matrox/matroxfb_crtc2.c
+++ b/
drivers/video/matrox/matroxfb_crtc2.c
@@
-15,7
+15,7
@@
#include "matroxfb_misc.h"
#include "matroxfb_DAC1064.h"
#include <linux/matroxfb.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
/* **************************************************** */