diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
| commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
| tree | 420073c8a29a401a3908803000df6f54673e1731 /arch/arm/include/asm/arch-aspeed | |
| parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
| parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
| download | u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.zip u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.tar.gz u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.tar.bz2 | |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'arch/arm/include/asm/arch-aspeed')
| -rw-r--r-- | arch/arm/include/asm/arch-aspeed/scu_ast2500.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-aspeed/scu_ast2600.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h index a415693..50d6a6b 100644 --- a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h +++ b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h @@ -140,7 +140,6 @@ #define SCU_CLKDUTY_RGMII2TXCK_MASK (0x7f << SCU_CLKDUTY_RGMII2TXCK_SHIFT) #ifndef __ASSEMBLY__ -#include <linux/types.h> struct ast2500_clk_priv { struct ast2500_scu *scu; diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2600.h b/arch/arm/include/asm/arch-aspeed/scu_ast2600.h index a2c8852..251bfa2 100644 --- a/arch/arm/include/asm/arch-aspeed/scu_ast2600.h +++ b/arch/arm/include/asm/arch-aspeed/scu_ast2600.h @@ -125,8 +125,6 @@ #define SCU_MISC_CTRL1_UART5_DIV BIT(12) #ifndef __ASSEMBLY__ -#include <linux/types.h> - struct ast2600_scu { uint32_t prot_key1; /* 0x000 */ uint32_t chip_id1; /* 0x004 */ |