summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2023-02-08 17:08:25 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-11 16:26:37 +0100
commit8972b8b0c94ebd15df274590456778f811afa1a1 (patch)
tree169628594db41e9cb8f8b6d65b7bc658e1a1f681 /arch/m68k
parent4dc335fa7c00f1d80a9e0bfca941a41d29465ef0 (diff)
downloadlinux-stable-8972b8b0c94ebd15df274590456778f811afa1a1.tar.gz
linux-stable-8972b8b0c94ebd15df274590456778f811afa1a1.tar.bz2
linux-stable-8972b8b0c94ebd15df274590456778f811afa1a1.zip
m68k: /proc/hardware should depend on PROC_FS
[ Upstream commit 1e5b5df65af99013b4d31607ddb3ca5731dbe44d ] When CONFIG_PROC_FS is not set, there is a build error for an unused function. Make PROC_HARDWARE depend on PROC_FS to prevent this error. In file included from ../arch/m68k/kernel/setup.c:3: ../arch/m68k/kernel/setup_mm.c:477:12: error: 'hardware_proc_show' defined but not used [-Werror=unused-function] 477 | static int hardware_proc_show(struct seq_file *m, void *v) | ^~~~~~~~~~~~~~~~~~ Fixes: 66d857b08b8c ("m68k: merge m68k and m68knommu arch directories") # v3.0 Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/20230209010825.24136-1-rdunlap@infradead.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/Kconfig.devices1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 3e9b0b826f8a..6fb693bb0771 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -19,6 +19,7 @@ config HEARTBEAT
# We have a dedicated heartbeat LED. :-)
config PROC_HARDWARE
bool "/proc/hardware support"
+ depends on PROC_FS
help
Say Y here to support the /proc/hardware file, which gives you
access to information about the machine you're running on,