update to 2.6.30-rc5

[openwrt/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 f08bc5311e0ef88dfb42e8d991f41dbd8028a73b..af2d2b1da9efcdc90bad9c5c5c222c46b83843a9 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
@@ -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/