summaryrefslogtreecommitdiff
path: root/target/linux/ifxmips/patches-2.6.32/100-board.patch
diff options
context:
space:
mode:
authorralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-25 09:50:33 +0000
committerralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-25 09:50:33 +0000
commit1b9f2e03e0591840f1f44fd903caf485e09a9ad0 (patch)
tree00958f7d31fa2bf24cbe12c73a06a3c1301eb80b /target/linux/ifxmips/patches-2.6.32/100-board.patch
parent7cdd1aeda4edb0fdc0f27eab1fa361bef7c164fa (diff)
[ifxmips] refresh .32 platform patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.32/100-board.patch')
-rw-r--r--target/linux/ifxmips/patches-2.6.32/100-board.patch26
1 files changed, 10 insertions, 16 deletions
diff --git a/target/linux/ifxmips/patches-2.6.32/100-board.patch b/target/linux/ifxmips/patches-2.6.32/100-board.patch
index 651371bfef..25713b328c 100644
--- a/target/linux/ifxmips/patches-2.6.32/100-board.patch
+++ b/target/linux/ifxmips/patches-2.6.32/100-board.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.33.2/arch/mips/Kconfig
-===================================================================
---- linux-2.6.33.2.orig/arch/mips/Kconfig 2010-04-02 23:31:00.000000000 +0200
-+++ linux-2.6.33.2/arch/mips/Kconfig 2010-04-02 23:38:38.000000000 +0200
-@@ -139,6 +139,9 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -151,6 +151,9 @@ config MACH_DECSTATION
otherwise choose R3000.
@@ -12,7 +10,7 @@ Index: linux-2.6.33.2/arch/mips/Kconfig
config MACH_JAZZ
bool "Jazz family of machines"
select ARC
-@@ -693,6 +696,7 @@
+@@ -685,6 +688,7 @@ source "arch/mips/txx9/Kconfig"
source "arch/mips/vr41xx/Kconfig"
source "arch/mips/cavium-octeon/Kconfig"
source "arch/mips/loongson/Kconfig"
@@ -20,11 +18,9 @@ Index: linux-2.6.33.2/arch/mips/Kconfig
endmenu
-Index: linux-2.6.33.2/arch/mips/Makefile
-===================================================================
---- linux-2.6.33.2.orig/arch/mips/Makefile 2010-04-02 23:31:01.000000000 +0200
-+++ linux-2.6.33.2/arch/mips/Makefile 2010-04-02 23:38:38.000000000 +0200
-@@ -317,6 +317,18 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -305,6 +305,18 @@ cflags-$(CONFIG_MIPS_COBALT) += -I$(srct
load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
#
@@ -43,11 +39,9 @@ Index: linux-2.6.33.2/arch/mips/Makefile
# DECstation family
#
core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/
-Index: linux-2.6.33.2/arch/mips/pci/Makefile
-===================================================================
---- linux-2.6.33.2.orig/arch/mips/pci/Makefile 2010-04-02 01:02:33.000000000 +0200
-+++ linux-2.6.33.2/arch/mips/pci/Makefile 2010-04-02 23:38:38.000000000 +0200
-@@ -55,7 +55,7 @@
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
+@@ -55,7 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capc
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o