[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / cavium-octeon / patches / 012-hook_up_eth_driver.patch

diff --git a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
index f08bc53..1a9dc00 100644 (file)
--- a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
+++ b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
@@ -7,8 +7,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  drivers/staging/Makefile |    1 +
  2 files changed, 3 insertions(+), 0 deletions(-)
 
  drivers/staging/Makefile |    1 +
  2 files changed, 3 insertions(+), 0 deletions(-)
 

-diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
-index 0dcf9ca..6c2ca23 100644

 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
 @@ -115,5 +115,7 @@ source "drivers/staging/line6/Kconfig"
 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
 @@ -115,5 +115,7 @@ source "drivers/staging/line6/Kconfig"


@@ -19,10 +17,10 @@ index 0dcf9ca..6c2ca23 100644
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING

---- a/drivers/staging/Makefile 2009-05-06 15:46:47.000000000 +0200
-+++ b/drivers/staging/Makefile 2009-05-06 15:47:33.000000000 +0200
-@@ -29,3 +29,4 @@
- obj-$(CONFIG_TRANZPORT)               += frontier/
- obj-$(CONFIG_EPL)             += epl/
- obj-$(CONFIG_ANDROID)         += android/
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -40,3 +40,4 @@ obj-$(CONFIG_PLAN9AUTH)              += p9auth/
+ obj-$(CONFIG_HECI)            += heci/
+ obj-$(CONFIG_LINE6_USB)               += line6/
+ obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100)       += serqt_usb/

 +obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
 +obj-$(CONFIG_OCTEON_ETHERNET) += octeon/