summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlbert Aribaud <albert.aribaud@free.fr>2010-07-12 22:24:29 +0200
committerBen Warren <biggerbadderben@gmail.com>2010-07-12 23:40:31 -0700
commitd3c9ffd07dbf76b7aff678996374be2352628aa0 (patch)
treeede57368e8de99d0bb3f3dae5f4705f16eabfe24 /drivers
parentd44265ad783f1896685db04faec148e32e918cda (diff)
mvgbe: add support for orion5x GbE controller
Add definitions and initialization in orion5x for mvgbe. Add orion5x in mvgbe SoC includes. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/mvgbe.c2
-rw-r--r--drivers/net/mvgbe.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index e44352c6765..cad40237c93 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -38,6 +38,8 @@
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/kirkwood.h>
+#elif defined(CONFIG_ORION5X)
+#include <asm/arch/orion5x.h>
#endif
#include "mvgbe.h"
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 7db5af450e2..3de98d01bd9 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -28,8 +28,6 @@
#ifndef __MVGBE_H__
#define __MVGBE_H__
-#define MAX_MVGBE_DEVS 2 /*controller has two ports */
-
/* PHY_BASE_ADR is board specific and can be configured */
#if defined (CONFIG_PHY_BASE_ADR)
#define PHY_BASE_ADR CONFIG_PHY_BASE_ADR