aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-26 09:57:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-26 09:57:34 +0000
commit1978ba87e089a6de36f8dab43f3a31bcd380ac51 (patch)
tree776ab6830592795c409565e0b68923d81d4f3705 /target/linux/ramips
parent695ed4b321ae4ea291e1c6db0bd38bb4e3006144 (diff)
downloadupstream-1978ba87e089a6de36f8dab43f3a31bcd380ac51.tar.gz
upstream-1978ba87e089a6de36f8dab43f3a31bcd380ac51.tar.bz2
upstream-1978ba87e089a6de36f8dab43f3a31bcd380ac51.zip
ramips: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19342 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch2
-rw-r--r--target/linux/ramips/patches-2.6.30/103-ethernet.patch16
2 files changed, 7 insertions, 11 deletions
diff --git a/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch b/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
index 40520181d6..f6f71c3e39 100644
--- a/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
+++ b/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
-@@ -52,3 +52,4 @@
+@@ -52,3 +52,4 @@ obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
diff --git a/target/linux/ramips/patches-2.6.30/103-ethernet.patch b/target/linux/ramips/patches-2.6.30/103-ethernet.patch
index 3a202d8519..1828cbfc16 100644
--- a/target/linux/ramips/patches-2.6.30/103-ethernet.patch
+++ b/target/linux/ramips/patches-2.6.30/103-ethernet.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.30.5/drivers/net/Kconfig
-===================================================================
---- linux-2.6.30.5.orig/drivers/net/Kconfig 2009-09-04 16:13:12.000000000 +0200
-+++ linux-2.6.30.5/drivers/net/Kconfig 2009-09-04 16:19:05.000000000 +0200
-@@ -612,6 +612,12 @@
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -612,6 +612,12 @@ config MIPS_AU1X00_ENET
If you have an Alchemy Semi AU1X00 based system
say Y. Otherwise, say N.
@@ -15,11 +13,9 @@ Index: linux-2.6.30.5/drivers/net/Kconfig
config SGI_IOC3_ETH
bool "SGI IOC3 Ethernet"
depends on PCI && SGI_IP27
-Index: linux-2.6.30.5/drivers/net/Makefile
-===================================================================
---- linux-2.6.30.5.orig/drivers/net/Makefile 2009-09-04 16:13:08.000000000 +0200
-+++ linux-2.6.30.5/drivers/net/Makefile 2009-09-04 16:16:34.000000000 +0200
-@@ -204,6 +204,7 @@
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -204,6 +204,7 @@ obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o