summaryrefslogtreecommitdiff
path: root/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-18 13:08:46 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-18 13:08:46 +0000
commit9db4496e781c6b6a08cfb804607bb49cdc757457 (patch)
tree447c45d65e6267ee3efc9e2e623448adf3f17646 /target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
parentce87c61ae982e6e82b500c4990f3ce018526b322 (diff)
downloadmtk-20170518-9db4496e781c6b6a08cfb804607bb49cdc757457.zip
mtk-20170518-9db4496e781c6b6a08cfb804607bb49cdc757457.tar.gz
mtk-20170518-9db4496e781c6b6a08cfb804607bb49cdc757457.tar.bz2
upgrade to 2.6.30-rc6, refresh patches
SVN-Revision: 15912
Diffstat (limited to 'target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch')
-rw-r--r--target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch9
1 files changed, 3 insertions, 6 deletions
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 af2d2b1..1a9dc00 100644
--- 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(-)
-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"
@@ -19,10 +17,9 @@ index 0dcf9ca..6c2ca23 100644
+
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING
-diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
---- a/drivers/staging/Makefile 2009-05-09 02:14:14.000000000 +0200
-+++ b/drivers/staging/Makefile 2009-05-12 12:38:22.000000000 +0200
-@@ -40,3 +40,4 @@
+--- 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/