diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-11 14:14:33 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-11 14:14:33 +0000 |
| commit | 77fef3ec173e1e55edce91e4790e40a1d9221859 (patch) | |
| tree | a8bfca48f6f456c4e6804bf01d509812dded20bf /target/linux/ifxmips/patches | |
| parent | 9a24ac5b8c947665253a616bfc273e0ccb141e41 (diff) | |
fix errors in ifxmips .25 bump
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11109 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches')
| -rw-r--r-- | target/linux/ifxmips/patches/100-board.patch | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch index 448e430faf..a4d3e4308e 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -1,7 +1,7 @@ Index: linux-2.6.25.1/arch/mips/Kconfig =================================================================== ---- linux-2.6.25.1.orig/arch/mips/Kconfig 2008-05-10 01:03:55.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/Kconfig 2008-05-10 01:09:11.000000000 +0100 +--- linux-2.6.25.1.orig/arch/mips/Kconfig 2008-05-10 01:14:39.000000000 +0100 ++++ linux-2.6.25.1/arch/mips/Kconfig 2008-05-10 01:29:54.000000000 +0100 @@ -78,6 +78,19 @@ select SYS_SUPPORTS_LITTLE_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ @@ -22,10 +22,18 @@ Index: linux-2.6.25.1/arch/mips/Kconfig config MACH_DECSTATION bool "DECstations" select BOOT_ELF32 +@@ -693,6 +706,7 @@ + source "arch/mips/tx4927/Kconfig" + source "arch/mips/tx4938/Kconfig" + source "arch/mips/vr41xx/Kconfig" ++source "arch/mips/ifxmips/Kconfig" + + endmenu + Index: linux-2.6.25.1/arch/mips/Makefile =================================================================== ---- linux-2.6.25.1.orig/arch/mips/Makefile 2008-05-10 01:04:02.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/Makefile 2008-05-10 01:04:03.000000000 +0100 +--- linux-2.6.25.1.orig/arch/mips/Makefile 2008-05-10 01:14:49.000000000 +0100 ++++ linux-2.6.25.1/arch/mips/Makefile 2008-05-10 01:14:49.000000000 +0100 @@ -282,6 +282,13 @@ cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 @@ -42,8 +50,8 @@ Index: linux-2.6.25.1/arch/mips/Makefile # Index: linux-2.6.25.1/include/asm-mips/bootinfo.h =================================================================== ---- linux-2.6.25.1.orig/include/asm-mips/bootinfo.h 2008-05-10 01:03:55.000000000 +0100 -+++ linux-2.6.25.1/include/asm-mips/bootinfo.h 2008-05-10 01:04:03.000000000 +0100 +--- linux-2.6.25.1.orig/include/asm-mips/bootinfo.h 2008-05-10 01:14:39.000000000 +0100 ++++ linux-2.6.25.1/include/asm-mips/bootinfo.h 2008-05-10 01:14:49.000000000 +0100 @@ -94,6 +94,12 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ @@ -59,8 +67,8 @@ Index: linux-2.6.25.1/include/asm-mips/bootinfo.h extern char *system_type; Index: linux-2.6.25.1/arch/mips/kernel/traps.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/kernel/traps.c 2008-05-10 01:09:32.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/kernel/traps.c 2008-05-10 01:10:07.000000000 +0100 +--- linux-2.6.25.1.orig/arch/mips/kernel/traps.c 2008-05-10 01:14:39.000000000 +0100 ++++ linux-2.6.25.1/arch/mips/kernel/traps.c 2008-05-10 01:14:49.000000000 +0100 @@ -1379,6 +1379,7 @@ */ if (cpu_has_mips_r2) { |