diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-19 23:12:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-19 23:12:22 +0200 |
| commit | 8bff839927f45731d7d6c6a9a5411670866db122 (patch) | |
| tree | 8a483da98db9e803a1b22d736ed1af23ed08c810 /arch/mips/sibyte/sb1250/setup.c | |
| parent | Merge branch 'parisc-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | MIPS: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU (diff) | |
| download | linux-8bff839927f45731d7d6c6a9a5411670866db122.tar.xz linux-8bff839927f45731d7d6c6a9a5411670866db122.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Another round of MIPS fixes for 4.2.
Things are looking quite decent at this stage but the recent work on
the FPU support took its toll:
- fix an incorrect overly restrictive ifdef
- select O32 64-bit FP support for O32 binary compatibility
- remove workarounds for Sibyte SB1250 Pass1 parts. There are rare
fixing the workarounds is not worth the effort.
- patch up an outdated and now incorrect comment"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU
MIPS: SB1: Remove support for Pass 1 parts.
MIPS: Require O32 FP64 support for MIPS64 with O32 compat
MIPS: asm-offset.c: Patch up various comments refering to the old filename.
Diffstat (limited to 'arch/mips/sibyte/sb1250/setup.c')
| -rw-r--r-- | arch/mips/sibyte/sb1250/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c index 3c02b2a77ae9..9d3c24efdf4a 100644 --- a/arch/mips/sibyte/sb1250/setup.c +++ b/arch/mips/sibyte/sb1250/setup.c @@ -202,12 +202,10 @@ void __init sb1250_setup(void) switch (war_pass) { case K_SYS_REVISION_BCM1250_PASS1: -#ifndef CONFIG_SB1_PASS_1_WORKAROUNDS printk("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, " "and the kernel doesn't have the proper " "workarounds compiled in. @@@@\n"); bad_config = 1; -#endif break; case K_SYS_REVISION_BCM1250_PASS2: /* Pass 2 - easiest as default for now - so many numbers */ |