summaryrefslogtreecommitdiffstats
path: root/drivers/video/imxfb.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-04 04:06:19 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 04:06:19 +0200
commit3c8c7b2f32c52b259daa7564fefd582146799b23 (patch)
tree59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/video/imxfb.c
parent[PATCH] hostap: Unregister netdevs before freeing local data (diff)
parent[PATCH] s390: qeth driver fixes (diff)
downloadlinux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz
linux-3c8c7b2f32c52b259daa7564fefd582146799b23.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/video/imxfb.c')
-rw-r--r--drivers/video/imxfb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 6c2244cf0e74..1d54d3d6960b 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -36,7 +36,6 @@
#include <asm/hardware.h>
#include <asm/io.h>
-#include <asm/mach-types.h>
#include <asm/uaccess.h>
#include <asm/arch/imxfb.h>