summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorEli Billauer <eli.billauer@gmail.com>2021-05-28 11:22:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-03 14:10:03 +0200
commit1b1ee3a91d21fdf7d415c1060db1a7a07ae296b6 (patch)
tree30f1fb6296365af408729edaf248a12e5d0e8c42 /drivers/char
parentMerge 5.13-rc4 into char-misc-next (diff)
downloadlinux-1b1ee3a91d21fdf7d415c1060db1a7a07ae296b6.tar.xz
linux-1b1ee3a91d21fdf7d415c1060db1a7a07ae296b6.zip
char: xillybus: Fix condition for invoking the xillybus/ subdirectory
As Xillybus' configuration symbol hierarchy has been reorganized recently, the correct condition for compiling the xillybus/ subdirectory is now CONFIG_XILLYBUS_CLASS, and not CONFIG_XILLYBUS. Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Eli Billauer <eli.billauer@gmail.com> Link: https://lore.kernel.org/r/20210528092242.51104-1-eli.billauer@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index ffce287ef415..c7e4fc733a37 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -44,6 +44,6 @@ obj-$(CONFIG_TCG_TPM) += tpm/
obj-$(CONFIG_PS3_FLASH) += ps3flash.o
-obj-$(CONFIG_XILLYBUS) += xillybus/
+obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/
obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
obj-$(CONFIG_ADI) += adi.o