aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-19 11:39:42 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 23:11:29 +0100
commitd98a80f5b69ef3e1127912a002e5f681fbeacfdf (patch)
tree9f7f7ee7e8f828fc1cfb36c00c57dc93d31d47bf /drivers
parentMerge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge (diff)
downloadlinux-dev-d98a80f5b69ef3e1127912a002e5f681fbeacfdf.tar.xz
linux-dev-d98a80f5b69ef3e1127912a002e5f681fbeacfdf.zip
net: mvmdio: use <linux/delay.h> instead of <asm/delay.h>
As suggested by checkpatch, using <linux/delay.h> instead of <asm/delay.h> is appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/marvell/mvmdio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
index 82fbd235e502..114a0f14244a 100644
--- a/drivers/net/ethernet/marvell/mvmdio.c
+++ b/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