diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-10-14 14:18:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-14 15:26:57 +0200 |
| commit | 60632c749eea1162d5afe4c02eb9701da44fff87 (patch) | |
| tree | a80456f4484bc67df1314d992f35fd056a29d428 /arch/arm/mach-at91 | |
| parent | 4d8f32f9a699bfd2a74dc928079248f8dc5f5fd6 (diff) | |
| download | barebox-60632c749eea1162d5afe4c02eb9701da44fff87.tar.gz barebox-60632c749eea1162d5afe4c02eb9701da44fff87.tar.xz | |
ARM: at91: delete no-longer needed #ifdef guards
c16bcbc644 ("ARM: at91: remove unused defines") removed conflicting
definitions from the headers, so we can include the headers
and code that uses them unconditionally now.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam926x_board_init.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h index d52a29e5ef..3dab64b71a 100644 --- a/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h +++ b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h @@ -183,28 +183,22 @@ static void __always_inline at91sam926x_board_init(void __iomem *smcbase, writel(0xffffffff, pmc + AT91_PMC_PCER); } -#if defined CONFIG_ARCH_AT91SAM9260 #include <mach/at91sam9260.h> static void __always_inline at91sam9260_board_init(struct at91sam926x_board_cfg *cfg) { at91sam926x_board_init(IOMEM(AT91SAM9260_BASE_SMC), cfg); } -#endif -#if defined CONFIG_ARCH_AT91SAM9261 || defined CONFIG_ARCH_AT91SAM9G10 #include <mach/at91sam9261.h> static void __always_inline at91sam9261_board_init(struct at91sam926x_board_cfg *cfg) { at91sam926x_board_init(IOMEM(AT91SAM9261_BASE_SMC), cfg); } -#endif -#if defined CONFIG_ARCH_AT91SAM9263 #include <mach/at91sam9263.h> static void __always_inline at91sam9263_board_init(struct at91sam926x_board_cfg *cfg) { at91sam926x_board_init(IOMEM(AT91SAM9263_BASE_SMC0), cfg); } -#endif #endif /* __AT91SAM926X_BOARD_INIT_H__ */ |