summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-06 08:54:13 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-06 08:54:13 +0000
commit33d588243377bef87f58e75d9d0286ec1648b1aa (patch)
tree3f320a60ba4fcfbc88877b5f4ca6f0dc90e8b815 /target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch
parent9c69dfe36ecb36406b91b2a8785ced1443593701 (diff)
[adm5120] refresh patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11374 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch
index 36579c529..20718119f 100644
--- a/target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch
+++ b/target/linux/adm5120/patches-2.6.25/003-adm5120_switch.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/net/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/Kconfig
-+++ linux-2.6.25.4/drivers/net/Kconfig
-@@ -606,6 +606,10 @@ config MIPS_AU1X00_ENET
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -606,6 +606,10 @@
If you have an Alchemy Semi AU1X00 based system
say Y. Otherwise, say N.
@@ -13,11 +11,9 @@ Index: linux-2.6.25.4/drivers/net/Kconfig
config SGI_IOC3_ETH
bool "SGI IOC3 Ethernet"
depends on PCI && SGI_IP27
-Index: linux-2.6.25.4/drivers/net/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/Makefile
-+++ linux-2.6.25.4/drivers/net/Makefile
-@@ -187,6 +187,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -187,6 +187,7 @@
# This is also a 82596 and should probably be merged
obj-$(CONFIG_LP486E) += lp486e.o