aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-05-30 17:31:49 -0400
committerWolfram Sang <wsa@the-dreams.de>2018-05-31 17:21:00 -0400
commit53e39628ac228fada53cc0106be62c6f65f67501 (patch)
tree8f1764f397c420fb79d018245dd412312083fbc9
parent535ba90472da812a55e5b95d30a916597c4f5f90 (diff)
i2c: qup: fix building without CONFIG_ACPI
The added Centriq support broke compilation with CONFIG_ACPI disabled: drivers/i2c/busses/i2c-qup.c: In function 'qup_i2c_probe': drivers/i2c/busses/i2c-qup.c:1707:25: error: 'qup_i2c_acpi_match' undeclared (first use in this function); did you mean 'qup_i2c_recv_data'? This fixes it by removing the extraneous #ifdef. All ACPI specific code will be dropped implicitly when that option is disabled, but the compiler first needs to see it. Fixes: 902a91a02bdf ("i2c: qup: add probe path for Centriq ACPI devices") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Austin Christ <austinwc@codeaurora.org> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r--drivers/i2c/busses/i2c-qup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index 4f793b5d0c3b..9cfcc0473227 100644
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1657,13 +1657,11 @@ static void qup_i2c_disable_clocks(struct qup_i2c_dev *qup)
1657 clk_disable_unprepare(qup->pclk); 1657 clk_disable_unprepare(qup->pclk);
1658} 1658}
1659 1659
1660#if IS_ENABLED(CONFIG_ACPI)
1661static const struct acpi_device_id qup_i2c_acpi_match[] = { 1660static const struct acpi_device_id qup_i2c_acpi_match[] = {
1662 { "QCOM8010"}, 1661 { "QCOM8010"},
1663 { }, 1662 { },
1664}; 1663};
1665MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match); 1664MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match);
1666#endif
1667 1665
1668static int qup_i2c_probe(struct platform_device *pdev) 1666static int qup_i2c_probe(struct platform_device *pdev)
1669{ 1667{