From abe4faec515585e92f196d9fbe88426ec7f2df51 Mon Sep 17 00:00:00 2001
From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Thu, 11 Oct 2012 00:15:57 +0000
Subject: [PATCH] --- yaml --- r: 333618 b: refs/heads/master c:
 cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/gbefb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3cb7c93ae409..b1b8ffa0d302 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0febd3bccff3ac005a570180209e44fb7de188df
+refs/heads/master: cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a
diff --git a/trunk/drivers/video/gbefb.c b/trunk/drivers/video/gbefb.c
index 9b79d3835f04..8dc1f7a55083 100644
--- a/trunk/drivers/video/gbefb.c
+++ b/trunk/drivers/video/gbefb.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/io.h>
 
 #ifdef CONFIG_X86
 #include <asm/mtrr.h>
@@ -28,7 +29,6 @@
 #include <asm/addrspace.h>
 #endif
 #include <asm/byteorder.h>
-#include <asm/io.h>
 #include <asm/tlbflush.h>
 
 #include <video/gbe.h>