[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / cavium-octeon / patches / 010-export_erratum_function.patch

diff --git a/target/linux/cavium-octeon/patches/010-export_erratum_function.patch b/target/linux/cavium-octeon/patches/010-export_erratum_function.patch
index 27c9e79..83b09fb 100644 (file)
--- a/target/linux/cavium-octeon/patches/010-export_erratum_function.patch
+++ b/target/linux/cavium-octeon/patches/010-export_erratum_function.patch
@@ -3,8 +3,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  .../cavium-octeon/executive/cvmx-helper-errata.c   |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
-index 8fb8205..868659e 100644
 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
 @@ -33,6 +33,8 @@
@@ -15,12 +13,9 @@ index 8fb8205..868659e 100644
 +
  #include <asm/octeon/octeon.h>
  
- #include <asm/octeon/cvmx-helper-jtag.h>
-@@ -68,3 +70,4 @@ void __cvmx_helper_errata_qlm_disable_2nd_order_cdr(int qlm)
+ #include <asm/octeon/cvmx-helper-util.h>
+@@ -377,3 +379,4 @@ void __cvmx_helper_errata_qlm_disable_2n
        }
        cvmx_helper_qlm_jtag_update(qlm);
  }
 +EXPORT_SYMBOL(__cvmx_helper_errata_qlm_disable_2nd_order_cdr);
--- 
-1.6.0.6
-