From 8132a66eac8f6e741b704a460f0d9c9734dabc73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Nov 2012 11:39:42 +0100
Subject: [PATCH] --- yaml --- r: 344248 b: refs/heads/master c:
 d98a80f5b69ef3e1127912a002e5f681fbeacfdf h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/marvell/mvmdio.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 802de3f8fbc8..5e173cbd4f5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05e121af947aa59647762aaf3773b6f53f498f67
+refs/heads/master: d98a80f5b69ef3e1127912a002e5f681fbeacfdf
diff --git a/trunk/drivers/net/ethernet/marvell/mvmdio.c b/trunk/drivers/net/ethernet/marvell/mvmdio.c
index 82fbd235e502..114a0f14244a 100644
--- a/trunk/drivers/net/ethernet/marvell/mvmdio.c
+++ b/trunk/drivers/net/ethernet/marvell/mvmdio.c
@@ -27,8 +27,7 @@
 #include <linux/of_address.h>
 #include <linux/of_mdio.h>
 #include <linux/platform_device.h>
-
-#include <asm/delay.h>
+#include <linux/delay.h>
 
 #define MVMDIO_SMI_DATA_SHIFT              0
 #define MVMDIO_SMI_PHY_ADDR_SHIFT          16