Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[karo-tx-linux.git] / drivers / video / fbcmap.c

diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index 148108afdd51a03b445fa9b9ff90ba54fd6f06be..91b78e691505d715b67de8c990f48ea8a1b420ea 100644 (file)
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -15,8 +15,7 @@
 #include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
-
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 static u16 red2[] __read_mostly = {
     0x0000, 0xaaaa