diff options
Diffstat (limited to 'target/linux/ixp4xx/patches/500-compex.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches/500-compex.patch | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/target/linux/ixp4xx/patches/500-compex.patch b/target/linux/ixp4xx/patches/500-compex.patch index 854194b35f..284a892a51 100644 --- a/target/linux/ixp4xx/patches/500-compex.patch +++ b/target/linux/ixp4xx/patches/500-compex.patch @@ -1,6 +1,7 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-10 01:56:21.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-ixp4xx/compex-setup.c @@ -122,10 +123,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt + .init_machine = compex_init, +MACHINE_END +#endif -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-04-10 00:22:16.000000000 +0200 -@@ -66,7 +66,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-pci.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-pci.c +@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = { int __init ixdp425_pci_init(void) { if (machine_is_ixdp425() || machine_is_ixcdp1100() || @@ -134,10 +136,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/ pci_common_init(&ixdp425_pci); return 0; } -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:33:31.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:48:37.000000000 +0200 -@@ -57,6 +57,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/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>. @@ -152,10 +155,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-04-10 00:33:39.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-09 20:23:06.000000000 +0200 -@@ -14,6 +14,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6 obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o @@ -163,17 +167,18 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/ obj-y += common.o -@@ -26,5 +27,6 @@ +@@ -30,5 +31,6 @@ obj-$(CONFIG_MACH_DSMG600) += dsmg6 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o +obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -diff -Nur linux-2.6.19.2/arch/arm/tools/mach-types linux-2.6.19.2-owrt/arch/arm/tools/mach-types ---- linux-2.6.19.2/arch/arm/tools/mach-types 2007-04-10 01:27:55.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/tools/mach-types 2007-04-09 20:22:33.000000000 +0200 -@@ -1278,7 +1278,7 @@ +Index: linux-2.6.21.7/arch/arm/tools/mach-types +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/tools/mach-types ++++ linux-2.6.21.7/arch/arm/tools/mach-types +@@ -1278,7 +1278,7 @@ oiab MACH_OIAB OIAB 1269 smdk6400 MACH_SMDK6400 SMDK6400 1270 nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 greenphone MACH_GREENPHONE GREENPHONE 1272 |