aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips/patches/100-board.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-07-26 10:53:23 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-07-26 10:53:23 +0000
commit104b3386a23c4179fb3a993bed106c256625a70d (patch)
tree2fe999020575731d650df26a0a188e045f2db29e /target/linux/ifxmips/patches/100-board.patch
parentbdfc0556b878cc06a0741983227a8f166079c50d (diff)
downloadupstream-104b3386a23c4179fb3a993bed106c256625a70d.tar.gz
upstream-104b3386a23c4179fb3a993bed106c256625a70d.tar.bz2
upstream-104b3386a23c4179fb3a993bed106c256625a70d.zip
update to 2.6.25.12
SVN-Revision: 11933
Diffstat (limited to 'target/linux/ifxmips/patches/100-board.patch')
-rw-r--r--target/linux/ifxmips/patches/100-board.patch30
1 files changed, 10 insertions, 20 deletions
diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch
index 38c8fd6b01..0e82af76b2 100644
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.7/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/Kconfig 2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/Kconfig 2008-06-26 22:05:19.000000000 +0200
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
@@ -78,6 +78,21 @@
select SYS_SUPPORTS_LITTLE_ENDIAN
select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -32,10 +30,8 @@ Index: linux-2.6.25.7/arch/mips/Kconfig
endmenu
-Index: linux-2.6.25.7/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/Makefile 2008-06-26 10:42:55.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/Makefile 2008-06-26 10:42:56.000000000 +0200
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
@@ -283,6 +283,13 @@
load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
@@ -50,10 +46,8 @@ Index: linux-2.6.25.7/arch/mips/Makefile
# DECstation family
#
core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/
-Index: linux-2.6.25.7/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.25.7.orig/include/asm-mips/bootinfo.h 2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/include/asm-mips/bootinfo.h 2008-06-26 10:42:56.000000000 +0200
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h
@@ -94,6 +94,12 @@
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
@@ -67,10 +61,8 @@ Index: linux-2.6.25.7/include/asm-mips/bootinfo.h
#define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type;
-Index: linux-2.6.25.7/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/kernel/traps.c 2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/kernel/traps.c 2008-06-26 10:42:56.000000000 +0200
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
@@ -1379,6 +1379,7 @@
*/
if (cpu_has_mips_r2) {
@@ -79,10 +71,8 @@ Index: linux-2.6.25.7/arch/mips/kernel/traps.c
cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
if (cp0_perfcount_irq == cp0_compare_irq)
cp0_perfcount_irq = -1;
-Index: linux-2.6.25.7/arch/mips/pci/Makefile
-===================================================================
---- linux-2.6.25.7.orig/arch/mips/pci/Makefile 2008-06-26 10:42:44.000000000 +0200
-+++ linux-2.6.25.7/arch/mips/pci/Makefile 2008-06-26 10:42:56.000000000 +0200
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
@@ -48,3 +48,4 @@
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o