summaryrefslogtreecommitdiff
path: root/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-02 10:17:03 +0000
commitd7d8665572aea1b814c4a59d1b25d4a41c3baa62 (patch)
treee5ff9d6b5df84b7ab7808e1cfd9e0261db5bc4ce /target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
parentaaac1064de71c495d284b981d83f70d3bd445826 (diff)
downloadmtk-20170518-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.zip
mtk-20170518-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.tar.gz
mtk-20170518-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.tar.bz2
update to 2.6.25.1 and refresh patches
SVN-Revision: 11006
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch36
1 files changed, 20 insertions, 16 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
index a83c421..507007e 100644
--- a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:26:46.000000000 +0200
-@@ -65,6 +65,14 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -16,7 +17,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
config MACH_COMPEX
bool "Compex WP18 / NP18A"
select PCI
-@@ -163,7 +171,7 @@
+@@ -163,7 +171,7 @@ config MACH_FSG
#
config CPU_IXP46X
bool
@@ -25,10 +26,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
default y
config CPU_IXP43X
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.23/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:23:52.000000000 +0200
-@@ -19,6 +19,7 @@
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
@@ -36,7 +38,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
obj-y += common.o
-@@ -36,6 +37,7 @@
+@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
@@ -44,9 +46,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c 2007-10-23 19:23:52.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
@@ -0,0 +1,71 @@
+/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@@ -119,9 +122,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/a
+}
+
+subsys_initcall(sidewinder_pci_init);
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c 2007-10-23 19:23:52.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
@@ -0,0 +1,115 @@
+/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c