diff options
| author | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /arch/nios2/cpu | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'arch/nios2/cpu')
| -rw-r--r-- | arch/nios2/cpu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/nios2/cpu/interrupts.c | 1 | ||||
| -rw-r--r-- | arch/nios2/cpu/traps.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index de7bfa947f1..792fa01ab9e 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -4,7 +4,7 @@ * Scott McNutt <[email protected]> */ -#include <common.h> +#include <config.h> #include <command.h> #include <cpu.h> #include <cpu_func.h> diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 90cabb67571..27093c4faa3 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -7,7 +7,6 @@ * Scott McNutt <[email protected]> */ -#include <common.h> #include <command.h> #include <irq_func.h> #include <asm/nios2.h> diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c index 087a05097d9..59690214f14 100644 --- a/arch/nios2/cpu/traps.c +++ b/arch/nios2/cpu/traps.c @@ -4,8 +4,8 @@ * Scott McNutt <[email protected]> */ -#include <common.h> #include <hang.h> +#include <stdio.h> #include <asm/ptrace.h> void trap_handler (struct pt_regs *regs) |