Merge branch 'vuplus-1.6k_dev' into vuplus-1.6k

[vuplus_openembedded] / recipes / linux / linux-vusolo2-2.6.37 / brcm_disable_enet1.patch

diff --git a/recipes/linux/linux-vusolo2-2.6.37/brcm_disable_enet1.patch b/recipes/linux/linux-vusolo2-2.6.37/brcm_disable_enet1.patch
new file mode 100644 (file)
index 0000000..698443d
--- /dev/null
+++ b/recipes/linux/linux-vusolo2-2.6.37/brcm_disable_enet1.patch
@@ -0,0 +1,13 @@
+diff --git a/arch/mips/brcmstb/bchip.c b/arch/mips/brcmstb/bchip.c
+index fc7883f..1fe5d4d 100644
+--- a/arch/mips/brcmstb/bchip.c
++++ b/arch/mips/brcmstb/bchip.c
+@@ -552,7 +552,7 @@ void __init bchip_set_features(void)
+       brcm_smp_enabled = 1;
+ #endif
+ #if defined(CONFIG_BRCM_HAS_EMAC_1) || defined(CONFIG_BRCM_HAS_GENET_1)
+-      brcm_enet1_enabled = 1;
++      brcm_enet1_enabled = 0;
+ #endif
+ #if defined(CONFIG_BRCM_HAS_MOCA)
+       brcm_moca_enabled = 1;