summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2021-08-17 14:24:06 +0930
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-18 13:40:14 +0200
commit947579a6967a651c3c33d983ecea9c2e6bfccbfb (patch)
tree2564135ae83c270464a5721f869793a6876db0ae /arch
parent1bc19e4062e9a1bb23c019879bb18341721cd2b6 (diff)
downloadlinux-stable-947579a6967a651c3c33d983ecea9c2e6bfccbfb.tar.gz
linux-stable-947579a6967a651c3c33d983ecea9c2e6bfccbfb.tar.bz2
linux-stable-947579a6967a651c3c33d983ecea9c2e6bfccbfb.zip
powerpc/config: Renable MTD_PHYSMAP_OF
[ Upstream commit d0e28a6145c3455b69991245e7f6147eb914b34a ] CONFIG_MTD_PHYSMAP_OF is not longer enabled as it depends on MTD_PHYSMAP which is not enabled. This is a regression from commit 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c"), which added the extra dependency. Add CONFIG_MTD_PHYSMAP=y so this stays in the config, as Christophe said it is useful for build coverage. Fixes: 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c") Signed-off-by: Joel Stanley <joel@jms.id.au> Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20210817045407.2445664-3-joel@jms.id.au Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 949ff9ccda5e..dbf3ff8adc65 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -34,6 +34,7 @@ CONFIG_MTD_CFI_GEOMETRY=y
# CONFIG_MTD_CFI_I2 is not set
CONFIG_MTD_CFI_I4=y
CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_OF=y
# CONFIG_BLK_DEV is not set
CONFIG_NETDEVICES=y