Merge branch 'master' into for-upstream

[linux-2.6-omap-h63xx.git] / drivers / video / matrox / matroxfb_g450.c

diff --git a/drivers/video/matrox/matroxfb_g450.c b/drivers/video/matrox/matroxfb_g450.c
index 4d610b405d45cabf85bd4570f45e9fe7ec4682af..6209a761f674e990c7c93d5746f065f504dc83c9 100644 (file)
--- a/drivers/video/matrox/matroxfb_g450.c
+++ b/drivers/video/matrox/matroxfb_g450.c
@@ -17,7 +17,6 @@
 #include "matroxfb_DAC1064.h"
 #include "g450_pll.h"
 #include <linux/matroxfb.h>
-#include <asm/uaccess.h>
 #include <asm/div64.h>
 
 #include "matroxfb_g450.h"