aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-05-12 12:59:45 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-05-12 12:59:45 +0000
commitcc3d03ca1f96ab38a38b456685f051e647213771 (patch)
tree526a82ed19c0560a04a91420329b9c4cc6679b17 /target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
parent69c9b897e64c980f8f519a4b76c5184c1bcbd26a (diff)
downloadupstream-cc3d03ca1f96ab38a38b456685f051e647213771.tar.gz
upstream-cc3d03ca1f96ab38a38b456685f051e647213771.tar.bz2
upstream-cc3d03ca1f96ab38a38b456685f051e647213771.zip
[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/006-octeon_mgmt_driver.patch')
-rw-r--r--target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
index ebac42ef1f..98053105bf 100644
--- a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
+++ b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
@@ -620,14 +620,14 @@ diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4a92305..4cbc22e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -228,6 +228,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
- pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
+@@ -234,6 +234,7 @@
obj-$(CONFIG_MLX4_CORE) += mlx4/
obj-$(CONFIG_ENC28J60) += enc28j60.o
+ obj-$(CONFIG_ETHOC) += ethoc.o
+obj-$(CONFIG_OCTEON_MGMT) += octeon/
-
+
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
-
+
diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile
new file mode 100644
index 0000000..f32f394