linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sinan Kaya <okaya@kernel.org>
To: linux-next@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, Sinan Kaya <okaya@kernel.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Len Brown <lenb@kernel.org>,
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v4 01/11] ACPI / LPSS: Make PCI dependency explicit
Date: Sun, 30 Dec 2018 19:56:02 +0000	[thread overview]
Message-ID: <20181230195612.6657-2-okaya@kernel.org> (raw)
In-Reply-To: <20181230195612.6657-1-okaya@kernel.org>

This code depends on PCI. Compile only when PCI is present.

Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 drivers/acpi/Makefile   | 3 ++-
 drivers/acpi/internal.h | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 7c6afc111d76..bb857421c2e8 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -41,7 +41,8 @@ acpi-y				+= ec.o
 acpi-$(CONFIG_ACPI_DOCK)	+= dock.o
 acpi-$(CONFIG_PCI)		+= pci_root.o pci_link.o pci_irq.o
 obj-$(CONFIG_ACPI_MCFG)		+= pci_mcfg.o
-acpi-y				+= acpi_lpss.o acpi_apd.o
+acpi-$(CONFIG_PCI)		+= acpi_lpss.o
+acpi-y				+= acpi_apd.o
 acpi-y				+= acpi_platform.o
 acpi-y				+= acpi_pnp.o
 acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 7e6952edb5b0..6a9e1fb8913a 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -81,7 +81,11 @@ void acpi_debugfs_init(void);
 #else
 static inline void acpi_debugfs_init(void) { return; }
 #endif
+#ifdef CONFIG_PCI
 void acpi_lpss_init(void);
+#else
+static inline void acpi_lpss_init(void) {}
+#endif
 
 void acpi_apd_init(void);
 
-- 
2.19.0


       reply	other threads:[~2018-12-30 19:56 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20181230195612.6657-1-okaya@kernel.org>
2018-12-30 19:56 ` Sinan Kaya [this message]
2018-12-30 19:56 ` [PATCH v4 02/11] ata: pata_acpi: " Sinan Kaya
2018-12-30 19:56 ` [PATCH v4 03/11] vga-switcheroo: make " Sinan Kaya
2019-01-07 10:34   ` Daniel Vetter
2019-01-07 10:53     ` Rafael J. Wysocki
2018-12-30 19:56 ` [PATCH v4 04/11] platform/x86: intel_ips: " Sinan Kaya
2018-12-30 19:56 ` [PATCH v4 05/11] platform/x86: intel_pmc: Make " Sinan Kaya
2018-12-30 19:56 ` [PATCH v4 06/11] platform/x86: apple-gmux: " Sinan Kaya
2018-12-30 20:01   ` Lukas Wunner
2018-12-30 19:56 ` [PATCH v4 07/11] drivers: thermal: int3406_thermal: " Sinan Kaya
2018-12-30 19:56 ` [PATCH v4 08/11] ASoC: Intel: atom: " Sinan Kaya
2018-12-31 17:46   ` Mark Brown
2018-12-31 17:52     ` Sinan Kaya
2018-12-31 19:30       ` Mark Brown
2018-12-31 19:35         ` Sinan Kaya
2018-12-31 20:29           ` Pierre-Louis Bossart
2018-12-31 20:35             ` Sinan Kaya
2018-12-31 21:42               ` Pierre-Louis Bossart
2019-01-01  1:07                 ` Sinan Kaya
2019-01-02 16:34                   ` [alsa-devel] " Pierre-Louis Bossart
2019-01-02  9:34   ` Rafael J. Wysocki
2019-01-02  9:36     ` Rafael J. Wysocki
2018-12-30 19:56 ` [PATCH v4 09/11] mmc: sdhci-acpi: " Sinan Kaya
2018-12-30 19:56 ` [PATCH v4 10/11] x86/intel/lpss: " Sinan Kaya
2018-12-30 19:56 ` [PATCH v4 11/11] drivers: thermal: int340x_thermal: " Sinan Kaya

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181230195612.6657-2-okaya@kernel.org \
    --to=okaya@kernel.org \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --subject='Re: [PATCH v4 01/11] ACPI / LPSS: Make PCI dependency explicit' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).