From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070AbcBUSnu (ORCPT ); Sun, 21 Feb 2016 13:43:50 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37355 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbcBUSns (ORCPT ); Sun, 21 Feb 2016 13:43:48 -0500 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Tony Lindgren , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Pavel Machel , Aaro Koskinen , Ivaylo Dimitrov , Nishanth Menon Cc: linux-pm@vger.kernel.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 3/6] power_supply: bq2415x_charger: Do not add acpi modalias when CONFIG_ACPI is not enabled Date: Sun, 21 Feb 2016 12:28:20 +0100 Message-Id: <1456054103-19551-4-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1456054103-19551-1-git-send-email-pali.rohar@gmail.com> References: <1456054103-19551-1-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Pali Rohár --- drivers/power/bq2415x_charger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c index 27e8953..b0863f4 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 = { -- 1.7.9.5