From patchwork Sun Feb 21 11:28:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 8369191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 00ABB9F2F0 for ; Sun, 21 Feb 2016 18:44:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 193522041A for ; Sun, 21 Feb 2016 18:44:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32ACA2040F for ; Sun, 21 Feb 2016 18:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbcBUSnu (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 Received: by mail-wm0-f47.google.com with SMTP id g62so135694581wme.0; Sun, 21 Feb 2016 10:43:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=myNxHxghg7lbRlMiyBdFGm9SV9TOh1MQ9qEyHxKS/r4=; b=jBGHM00st+ZrxBLZfsa6GOBFk+OpI+tJCD53BQl7XKdzh5ionNBZlMeAsy8rSYmauQ KNlNZTSWZzOZq1QJkWQwhbJIwhg4OmLm9ssHh1fBDZgMcI8+5OOhkeyKuD388hyNUwi8 QQv3aq2WCT+4gOquIuFFgC9wL/s7thk0xyMvEcfKwYWHsJcz2Yrs6LLQZhbbPeQzYJQ8 MoFQ9wU/IZX0ZkQTv+2WbfXFiRDahcE3zObEN1NNhgpgcaBEfurn3ju5Gx9h3xfWfEjb B6Tq53OuxfAqZN4aTQGhPXFWTz9f9gEJgzvFILfCfZYQWkk/1OwK6Ptynyb3oZGiaDvd i2Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=myNxHxghg7lbRlMiyBdFGm9SV9TOh1MQ9qEyHxKS/r4=; b=FxV1yyNKqA6ApNZPKpoEL6WY2B2qM0hfCI7XlcSDoGfcfKYHctrAYAFJnG4SNXvKQF ybC6aOMUYf2X2puLdxunK2bQOr6ZX36wM0ytZbz5nHoWVGQPub/dFIbahbrSn9r+baKO 0Jr65njKiklhv1yAYzfml8vwwBTx8krg0bhkwFPOxpiDpBiXmams0KWCNRwtuYtwJqYx 5GIsOR7dXVLEncfYeNY2RW+2Gc9zHR4zQjwIu6dXPxZERu7oaLMKQvxd2wIuP2fC9amK vQJrbzpa8NiaEt+TK3CVLzQXu1poPVw2Y3SJCpk63YuqZTsjkU6cRcJ2ue16jbzXbrVd 2yXA== X-Gm-Message-State: AG10YOQM25TT8F5/G340rMS2h1s1blKZIFK3H/mfLzf4vuTtsx0I1/89Dh4i8VlQQATrRg== X-Received: by 10.28.126.65 with SMTP id z62mr7135065wmc.3.1456054140660; Sun, 21 Feb 2016 03:29:00 -0800 (PST) Received: from localhost.localdomain (pali.kolej.mff.cuni.cz. [78.128.193.202]) by smtp.gmail.com with ESMTPSA id jc7sm19670939wjb.33.2016.02.21.03.28.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Feb 2016 03:29:00 -0800 (PST) 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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 = {