summaryrefslogtreecommitdiffstats
path: root/drivers/soc/apple
diff options
context:
space:
mode:
authorHector Martin <marcan@marcan.st>2023-03-28 13:38:26 +0200
committerHector Martin <marcan@marcan.st>2023-11-23 11:10:39 +0100
commitc84292d9d253706267889cf2614400712f15d689 (patch)
treeecf0dd91e796faa2fdae76266701bf330adc8596 /drivers/soc/apple
parentmailbox: apple: Delete driver (diff)
downloadlinux-c84292d9d253706267889cf2614400712f15d689.tar.xz
linux-c84292d9d253706267889cf2614400712f15d689.zip
soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX
With the original owner of APPLE_MAILBOX removed, let's rename the new APPLE_MBOX to the old name. This avoids .config churn for downstream users, and leaves us with an identical config symbol and module name as before. Acked-by: Eric Curtin <ecurtin@redhat.com> Acked-by: Neal Gompa <neal@gompa.dev> Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'drivers/soc/apple')
-rw-r--r--drivers/soc/apple/Kconfig5
-rw-r--r--drivers/soc/apple/Makefile2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/soc/apple/Kconfig b/drivers/soc/apple/Kconfig
index 24309e40fbbe..6388cbe1e56b 100644
--- a/drivers/soc/apple/Kconfig
+++ b/drivers/soc/apple/Kconfig
@@ -4,11 +4,10 @@ if ARCH_APPLE || COMPILE_TEST
menu "Apple SoC drivers"
-config APPLE_MBOX
+config APPLE_MAILBOX
tristate "Apple SoC mailboxes"
depends on PM
depends on ARCH_APPLE || (64BIT && COMPILE_TEST)
- depends on !APPLE_MAILBOX
default ARCH_APPLE
help
Apple SoCs have various co-processors required for certain
@@ -20,7 +19,7 @@ config APPLE_MBOX
config APPLE_RTKIT
tristate "Apple RTKit co-processor IPC protocol"
- depends on APPLE_MBOX
+ depends on APPLE_MAILBOX
depends on ARCH_APPLE || COMPILE_TEST
default ARCH_APPLE
help
diff --git a/drivers/soc/apple/Makefile b/drivers/soc/apple/Makefile
index 2a7835eda070..4d9ab8f3037b 100644
--- a/drivers/soc/apple/Makefile
+++ b/drivers/soc/apple/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_APPLE_MBOX) += apple-mailbox.o
+obj-$(CONFIG_APPLE_MAILBOX) += apple-mailbox.o
apple-mailbox-y = mailbox.o
obj-$(CONFIG_APPLE_RTKIT) += apple-rtkit.o