From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 16 Sep 2022 09:58:07 +0000 (+0200)
Subject: ARM: sa1100: un-deprecate jornada720
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8faf91c48ca20c714e0dd8cc5f510e3819852912;p=linux.git

ARM: sa1100: un-deprecate jornada720

Stefan is still trying to get this machine working again, so it won't
be removed in this round.

Cc: Stefan Lehner <stefan-lehner@aon.at>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig
index ae1d68da4f2ac..91bdcc095884e 100644
--- a/arch/arm/configs/jornada720_defconfig
+++ b/arch/arm/configs/jornada720_defconfig
@@ -6,7 +6,6 @@ CONFIG_ARCH_MULTI_V4=y
 CONFIG_ARCH_SA1100=y
 CONFIG_SA1100_JORNADA720=y
 CONFIG_SA1100_JORNADA720_SSP=y
-CONFIG_UNUSED_BOARD_FILES=y
 CONFIG_FPE_NWFPE=y
 CONFIG_PM=y
 CONFIG_MODULES=y
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index fb9cd10705de7..8b6360e363d18 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -109,7 +109,6 @@ config SA1100_BADGE4
 
 config SA1100_JORNADA720
 	bool "HP Jornada 720"
-	depends on UNUSED_BOARD_FILES
 	# FIXME: select ARM_SA11x0_CPUFREQ
 	select SA1111
 	help