[PATCH 7/9] Include files fixes for clean compilation

[Brad Figg]

From: Shadi Ammouri <shadi at marvell.com>

Signed-off-by: Shadi Ammouri <shadi at marvell.com>
Signed-off-by: Saeed Bishara <saeed at marvell.com>
Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 arch/arm/mach-dove/common.c                       |   28 +++++++++++---------
 arch/arm/mach-dove/mv_hal_support/mvKW_HAL_glue.c |    1 +
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 1d2172d..fd10ba0 100755
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -45,6 +45,7 @@
 #include <plat/mv_eth.h>
 #include <plat/time.h>
 #include <plat/mv_xor.h>
+#include <mvSysHwConfig.h>
 #include <ctrlEnv/mvCtrlEnvRegs.h>
 #include "ctrlEnv/sys/mvCpuIfRegs.h"
 #ifdef CONFIG_MV_ETHERNET
@@ -103,6 +104,20 @@ int mv_usb1_cmdline_config(char *s);
 __setup("usb0Mode=", mv_usb0_cmdline_config);
 __setup("usb1Mode=", mv_usb1_cmdline_config);
 
+int mv_usb0_cmdline_config(char *s)
+{
+    usb0Mode = s;
+    return 1;
+}
+
+int mv_usb1_cmdline_config(char *s)
+{
+    usb1Mode = s;
+    return 1;
+}
+
+#endif 
+
 static int noL2 = 0;
 static int __init noL2_setup(char *__unused)
 {
@@ -139,20 +154,7 @@ static int __init dvs_enable_setup(char *__unused)
 
 __setup("dvs_enable", dvs_enable_setup);
 
-int mv_usb0_cmdline_config(char *s)
-{
-    usb0Mode = s;
-    return 1;
-}
 
-int mv_usb1_cmdline_config(char *s)
-{
-    usb1Mode = s;
-    return 1;
-}
-
-
-#endif
 #include "common.h"
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-dove/mv_hal_support/mvKW_HAL_glue.c b/arch/arm/mach-dove/mv_hal_support/mvKW_HAL_glue.c
index 8e6f7d8..ae49b62 100755
--- a/arch/arm/mach-dove/mv_hal_support/mvKW_HAL_glue.c
+++ b/arch/arm/mach-dove/mv_hal_support/mvKW_HAL_glue.c
@@ -38,6 +38,7 @@ disclaimer.
 #include "mvOs.h"
 #include "mvCommon.h"
 #include "ctrlEnv/mvCtrlEnvRegs.h"
+#include "mvSysHwConfig.h"
 #ifdef CONFIG_MV_INCLUDE_GIG_ETH
 #include "eth/mvEth.h"
 #endif
-- 
1.6.0.4