projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
64876fe
)
power_supply: bq2415x_charger: Do not add acpi modalias when CONFIG_ACPI is not enabled
author
Pali Rohár
<pali.rohar@gmail.com>
Sun, 21 Feb 2016 11:28:20 +0000
(12:28 +0100)
committer
Sebastian Reichel
<sre@kernel.org>
Sun, 21 Feb 2016 19:25:10 +0000
(20:25 +0100)
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>
drivers/power/bq2415x_charger.c
patch
|
blob
|
history
diff --git
a/drivers/power/bq2415x_charger.c
b/drivers/power/bq2415x_charger.c
index 27e89536689aa1d9de6d359808a827c3822e432f..b0863f4bef6f5e54029f9157be894a8e0e9b1dac 100644
(file)
--- 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 = {