diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2009-05-18 13:08:46 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2009-05-18 13:08:46 +0000 |
commit | 902d39e4bd1554e643bfe8b95e6d6ccd27024341 (patch) | |
tree | e83fee55c57e9dceb98b8a9b1d390d70852be874 /target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch | |
parent | 5e4b8631641cbff891ded5a5b4fedd383cf594d0 (diff) | |
download | upstream-902d39e4bd1554e643bfe8b95e6d6ccd27024341.tar.gz upstream-902d39e4bd1554e643bfe8b95e6d6ccd27024341.tar.bz2 upstream-902d39e4bd1554e643bfe8b95e6d6ccd27024341.zip |
upgrade to 2.6.30-rc6, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15912 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.patch | 9 |
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 af2d2b1da9..1a9dc00649 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/ |