diff options
| author | Tom Rini <trini@ti.com> | 2013-07-24 09:30:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-25 08:51:48 -0400 |
| commit | 230187ce266889ad465b39ded6717805379e7ffe (patch) | |
| tree | da91d96b28eba97d7e14ffee800fc1003dac880d /arch/mips/cpu/mips64 | |
| parent | 8dde4ca90ee12a9dd40f42b80e51107ecd26ebe0 (diff) | |
| parent | db2c86d7d71d1be0ac0fe702493faf9302639235 (diff) | |
| download | u-boot-imx-230187ce266889ad465b39ded6717805379e7ffe.zip u-boot-imx-230187ce266889ad465b39ded6717805379e7ffe.tar.gz u-boot-imx-230187ce266889ad465b39ded6717805379e7ffe.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Conflict over SPDX changes means that one change was effectively dropped
as it was fixing typos in a removed hunk of text.
Conflicts:
arch/mips/cpu/mips64/start.S
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/mips/cpu/mips64')
| -rw-r--r-- | arch/mips/cpu/mips64/interrupts.c | 1 | ||||
| -rw-r--r-- | arch/mips/cpu/mips64/start.S | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/cpu/mips64/interrupts.c b/arch/mips/cpu/mips64/interrupts.c index 1a589fc..a7e2ed0 100644 --- a/arch/mips/cpu/mips64/interrupts.c +++ b/arch/mips/cpu/mips64/interrupts.c @@ -6,7 +6,6 @@ */ #include <common.h> -#include <asm/mipsregs.h> void enable_interrupts(void) { diff --git a/arch/mips/cpu/mips64/start.S b/arch/mips/cpu/mips64/start.S index 478b8c6..92954e1 100644 --- a/arch/mips/cpu/mips64/start.S +++ b/arch/mips/cpu/mips64/start.S @@ -3,7 +3,7 @@ * * Copyright (c) 2003 Wolfgang Denk <wd@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> |