diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /arch/mips | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/global_data.h | 1 | ||||
| -rw-r--r-- | arch/mips/lib/traps.c | 1 | ||||
| -rw-r--r-- | arch/mips/mach-mtmips/Kconfig | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index 147a95ec..34b7e0b 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -9,7 +9,6 @@ #include <linux/types.h> #include <asm/regdef.h> -#include <asm/u-boot.h> struct octeon_eeprom_mac_addr { u8 mac_addr_base[6]; diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 89846c9..40469d1 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -20,6 +20,7 @@ #include <asm/mipsregs.h> #include <asm/addrspace.h> #include <asm/system.h> +#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig index 3fcd0b8..15b2792 100644 --- a/arch/mips/mach-mtmips/Kconfig +++ b/arch/mips/mach-mtmips/Kconfig @@ -80,7 +80,6 @@ config SOC_MT7621 bool "MT7621" select MIPS_CM select MIPS_L2_CACHE - select MMC_SUPPORTS_TUNING select SYS_CACHE_SHIFT_5 select SYS_MIPS_CACHE_INIT_RAM_LOAD select PINCTRL_MT7621 |