Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 4f1f4be91d130ec83cf196e7ed0316e58809cd1e..470920dca2f0347fcb3d19d81a5a4b21627af536 100644 (file)
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -27,7 +27,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/omapfb.h>
+#include <mach/omapfb.h>
 
 #include "dispc.h"