From b9440b80dba9a7fded5c3b90942eb2fa502fab5f Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 7 Jan 2013 10:25:03 +0530
Subject: [PATCH] --- yaml --- r: 354757 b: refs/heads/master c:
 e32a9f8f34cc5eaf77100cd2d54e78e81d01f5dc h: refs/heads/master i:   354755:
 78758dc45091e98ce60891d22e97e0fe89cdfda4 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/tty/serial/imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58a14545d09d..dbc2889a4be4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82313e66b1a449b08682043929003fab38ebf037
+refs/heads/master: e32a9f8f34cc5eaf77100cd2d54e78e81d01f5dc
diff --git a/trunk/drivers/tty/serial/imx.c b/trunk/drivers/tty/serial/imx.c
index d6bce6c6329f..426253c2821d 100644
--- a/trunk/drivers/tty/serial/imx.c
+++ b/trunk/drivers/tty/serial/imx.c
@@ -48,8 +48,8 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/platform_data/serial-imx.h>