diff options
| author | Tom Rini <[email protected]> | 2024-10-18 09:04:20 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-18 09:04:20 -0600 |
| commit | f8fe853a8de7523685e1322d6131366ebf2e5e7f (patch) | |
| tree | 0f36fea5129025076f3a5e99569797d1dae00b34 | |
| parent | 933d27e1c90dd27d8cb5cc715e4d45a6bfd9ca0f (diff) | |
| parent | 684939089a31b8a5bedbbb4c2f2bcf935da7d9c6 (diff) | |
Merge tag 'u-boot-at91-fixes-2025.01-a' of https://source.denx.de/u-boot/custodians/u-boot-at91
First set of u-boot-at91 fixes for the 2025.01 cycle:
This small set includes the maintainer e-mail update and a missing
header that was causing some build issues.
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/clk.h | 1 | ||||
| -rw-r--r-- | doc/git-mailrc | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -38,7 +38,8 @@ Boris Brezillon <[email protected]> <[email protected]> Christian Kohn <[email protected]> <[email protected]> Dirk Behme <[email protected]> Durga Challa <[email protected]> <[email protected]> -Eugen Hristev <[email protected]> <[email protected]> +Eugen Hristev <[email protected]> <[email protected]> +Eugen Hristev <[email protected]> <[email protected]> Fabio Estevam <[email protected]> Harini Katakam <[email protected]> <[email protected]> Harsha <[email protected]> <[email protected]> diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h index c1d92739e47..09b8f0586c6 100644 --- a/arch/arm/mach-at91/include/mach/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -11,6 +11,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/at91_pmc.h> #include <asm/global_data.h> +#include <asm/io.h> #define GCK_CSS_SLOW_CLK 0 #define GCK_CSS_MAIN_CLK 1 diff --git a/doc/git-mailrc b/doc/git-mailrc index ca2f67a3b6e..1177e42df2f 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -22,7 +22,7 @@ alias apritzel Andre Przywara <[email protected]> alias bmeng Bin Meng <[email protected]> alias danielschwierzeck Daniel Schwierzeck <[email protected]> alias dinh Dinh Nguyen <[email protected]> -alias ehristev Eugen Hristev <[email protected]> +alias ehristev Eugen Hristev <[email protected]> alias hs Heiko Schocher <[email protected]> alias freenix Peng Fan <[email protected]> alias iwamatsu Nobuhiro Iwamatsu <[email protected]> |