kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 013-MIPS-BMIPS-extend-BMIPS3300-to-include-BMIPS32.patch
1 From e742d5b77ec18926293ec5d101470522f67ee159 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Thu, 15 Aug 2013 12:10:11 +0200
4 Subject: [PATCH V2 07/13] MIPS: BMIPS: extend BMIPS3300 to include BMIPS32
5
6 Codewise there is no difference between these two, so it does not make
7 sense to treat them differently. Also chip families having one of these
8 tend to have the other.
9
10 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
11 ---
12 arch/mips/Kconfig | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 --- a/arch/mips/Kconfig
16 +++ b/arch/mips/Kconfig
17 @@ -1400,7 +1400,7 @@ config CPU_BMIPS
18 bool "Broadcom BMIPS"
19 depends on SYS_HAS_CPU_BMIPS
20 select CPU_MIPS32
21 - select CPU_BMIPS3300 if SYS_HAS_CPU_BMIPS3300
22 + select CPU_BMIPS32_3300 if SYS_HAS_CPU_BMIPS32_3300
23 select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350
24 select CPU_BMIPS4380 if SYS_HAS_CPU_BMIPS4380
25 select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000
26 @@ -1412,7 +1412,7 @@ config CPU_BMIPS
27 select CPU_SUPPORTS_HIGHMEM
28 select CPU_HAS_PREFETCH
29 help
30 - Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
31 + Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.
32
33 config CPU_XLR
34 bool "Netlogic XLR SoC"
35 @@ -1495,7 +1495,7 @@ config CPU_LOONGSON1
36 select CPU_SUPPORTS_32BIT_KERNEL
37 select CPU_SUPPORTS_HIGHMEM
38
39 -config CPU_BMIPS3300
40 +config CPU_BMIPS32_3300
41 bool
42
43 config CPU_BMIPS4350
44 @@ -1589,7 +1589,7 @@ config SYS_HAS_CPU_CAVIUM_OCTEON
45 config SYS_HAS_CPU_BMIPS
46 bool
47
48 -config SYS_HAS_CPU_BMIPS3300
49 +config SYS_HAS_CPU_BMIPS32_3300
50 bool
51 select SYS_HAS_CPU_BMIPS
52