---

yaml --- r: 344248 b: refs/heads/master c: d98a80f h: refs/heads/master v: v3
git-mirror · Nov 20, 2012 · 8132a66 · 8132a66
1 parent 7d61e9a
commit 8132a66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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