summaryrefslogtreecommitdiffstats
path: root/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-12 12:59:45 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-12 12:59:45 +0000
commitc0d013dd1b33bcab1abb0729aa2585f8631fd27f (patch)
tree526a82ed19c0560a04a91420329b9c4cc6679b17 /target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
parent2dbfe770ef9c1b37abe58485b0f584089650b86e (diff)
[cavium-octeon] update to 2.6.30-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15799 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch13
1 files changed, 7 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 f08bc5311..af2d2b1da 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
@@ -19,10 +19,11 @@ index 0dcf9ca..6c2ca23 100644
+
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/
+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 @@
+ obj-$(CONFIG_HECI) += heci/
+ obj-$(CONFIG_LINE6_USB) += line6/
+ obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100) += serqt_usb/
+obj-$(CONFIG_OCTEON_ETHERNET) += octeon/