summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2016-02-21 12:28:20 +0100
committerSebastian Reichel <sre@kernel.org>2016-02-21 20:25:10 +0100
commitec3d7d08c2f8ad09897096d74cdbc6fa6ba89bce (patch)
treea1bd6b811b96c00debc3e678533aa44ce668c465 /drivers
parent64876fe552cf09ba26b71bd69a004bf72b86dc18 (diff)
downloadlinux-stable-ec3d7d08c2f8ad09897096d74cdbc6fa6ba89bce.tar.gz
linux-stable-ec3d7d08c2f8ad09897096d74cdbc6fa6ba89bce.tar.bz2
linux-stable-ec3d7d08c2f8ad09897096d74cdbc6fa6ba89bce.zip
power_supply: bq2415x_charger: Do not add acpi modalias when CONFIG_ACPI is not enabled
Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/bq2415x_charger.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index 27e89536689a..b0863f4bef6f 100644
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -1759,6 +1759,7 @@ static const struct i2c_device_id bq2415x_i2c_id_table[] = {
};
MODULE_DEVICE_TABLE(i2c, bq2415x_i2c_id_table);
+#ifdef CONFIG_ACPI
static const struct acpi_device_id bq2415x_i2c_acpi_match[] = {
{ "BQ2415X", BQUNKNOWN },
{ "BQ241500", BQ24150 },
@@ -1776,6 +1777,7 @@ static const struct acpi_device_id bq2415x_i2c_acpi_match[] = {
{},
};
MODULE_DEVICE_TABLE(acpi, bq2415x_i2c_acpi_match);
+#endif
static struct i2c_driver bq2415x_driver = {
.driver = {