From 24671234f13df514f08a4bcce53c6804914d4dec Mon Sep 17 00:00:00 2001 From: David Collins Date: Wed, 6 Nov 2019 16:07:23 -0800 Subject: [PATCH] platform: msm: qpnp-revid: replace #ifdef with #if IS_ENABLED() Replace #ifdef CONFIG_QPNP_REVID with #if IS_ENABLED(CONFIG_QPNP_REVID). This fixes a function redefinition error when compiling the qpnp-revid driver as a module with CONFIG_QPNP_REVID=m in a defconfig file. Change-Id: Ie1907010b8bbcd13fdc301f5647af9e081f6088a Signed-off-by: David Collins --- include/linux/qpnp/qpnp-revid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h index e40921efb1be..35adbaa86efd 100644 --- a/include/linux/qpnp/qpnp-revid.h +++ b/include/linux/qpnp/qpnp-revid.h @@ -330,7 +330,7 @@ struct pmic_revid_data { int tp_rev; }; -#ifdef CONFIG_QPNP_REVID +#if IS_ENABLED(CONFIG_QPNP_REVID) struct pmic_revid_data *get_revid_data(struct device_node *dev_node); #else static inline