diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-05-12 12:59:45 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-05-12 12:59:45 +0000 |
| commit | f27feec22f824ff2ab0041aebb3b45852f488929 (patch) | |
| tree | 8d07822ef89cb30a76cdb7ca738acfb3940ddfbb /target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch | |
| parent | 214f8bee10f06a41a72d77aac67f08c655cb9b94 (diff) | |
| download | upstream-f27feec22f824ff2ab0041aebb3b45852f488929.tar.gz upstream-f27feec22f824ff2ab0041aebb3b45852f488929.tar.bz2 upstream-f27feec22f824ff2ab0041aebb3b45852f488929.zip | |
update to 2.6.30-rc5
SVN-Revision: 15799
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.patch | 13 |
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 f08bc5311e..af2d2b1da9 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/ |