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>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v6 01/11] ACPI / LPSS: Make PCI dependency explicit
Date: Sat, 5 Jan 2019 10:05:56 +0000 [thread overview]
Message-ID: <20190105100606.6673-2-okaya@kernel.org> (raw)
In-Reply-To: <20190105100606.6673-1-okaya@kernel.org>
After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
CONFIG_PCI set")', it is possible to build ACPI without any PCI support.
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
WARNING: multiple messages have this Message-ID (diff)
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 v6 01/11] ACPI / LPSS: Make PCI dependency explicit
Date: Sat, 5 Jan 2019 10:05:56 +0000 [thread overview]
Message-ID: <20190105100606.6673-2-okaya@kernel.org> (raw)
In-Reply-To: <20190105100606.6673-1-okaya@kernel.org>
After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
CONFIG_PCI set")', it is possible to build ACPI without any PCI support.
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
next parent reply other threads:[~2019-01-05 10:05 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190105100606.6673-1-okaya@kernel.org>
2019-01-05 10:05 ` Sinan Kaya [this message]
2019-01-05 10:05 ` [PATCH v6 01/11] ACPI / LPSS: Make PCI dependency explicit Sinan Kaya
2019-01-05 10:05 ` [PATCH v6 02/11] ata: pata_acpi: " Sinan Kaya
2019-01-05 10:05 ` Sinan Kaya
2019-01-05 10:05 ` [PATCH v6 03/11] vga-switcheroo: make " Sinan Kaya
2019-01-05 10:05 ` Sinan Kaya
2019-01-05 10:05 ` [PATCH v6 04/11] platform/x86: intel_ips: " Sinan Kaya
2019-01-05 10:05 ` Sinan Kaya
2019-01-05 10:06 ` [PATCH v6 05/11] platform/x86: intel_pmc: Make " Sinan Kaya
2019-01-05 10:06 ` Sinan Kaya
2019-01-09 10:47 ` Rafael J. Wysocki
2019-01-09 11:10 ` Andy Shevchenko
2019-01-15 18:40 ` Rafael J. Wysocki
2019-01-05 10:06 ` [PATCH v6 06/11] platform/x86: apple-gmux: " Sinan Kaya
2019-01-05 10:06 ` Sinan Kaya
2019-01-05 10:06 ` [PATCH v6 07/11] drivers: thermal: int3406_thermal: " Sinan Kaya
2019-01-05 10:06 ` Sinan Kaya
2019-01-07 11:19 ` Rafael J. Wysocki
2019-01-08 11:58 ` Zhang Rui
2019-01-08 13:03 ` Sinan Kaya
2019-01-05 10:06 ` [PATCH v6 08/11] ASoC: Intel: atom: " Sinan Kaya
2019-01-05 10:06 ` Sinan Kaya
2019-01-07 11:15 ` Rafael J. Wysocki
2019-01-07 12:19 ` Mark Brown
2019-01-07 12:19 ` Mark Brown
2019-01-07 15:16 ` Sinan Kaya
2019-01-07 15:41 ` Mark Brown
2019-01-07 15:41 ` Mark Brown
2019-01-07 15:13 ` Sinan Kaya
2019-01-05 10:06 ` [PATCH v6 09/11] mmc: sdhci-acpi: " Sinan Kaya
2019-01-05 10:06 ` Sinan Kaya
2019-01-07 11:17 ` Rafael J. Wysocki
2019-01-07 12:42 ` Adrian Hunter
2019-01-07 12:42 ` Adrian Hunter
2019-01-07 12:48 ` Shah, Nehal-bakulchandra
2019-01-07 12:48 ` Shah, Nehal-bakulchandra
2019-01-09 2:10 ` Wang, Dongsheng
2019-01-09 2:10 ` Wang, Dongsheng
2019-01-08 13:27 ` Arnd Bergmann
2019-01-14 8:32 ` Adrian Hunter
2019-01-14 11:44 ` Ulf Hansson
2019-01-05 10:06 ` [PATCH v6 10/11] x86/intel/lpss: " Sinan Kaya
2019-01-05 10:06 ` Sinan Kaya
2019-01-05 10:06 ` [PATCH v6 11/11] drivers: thermal: int340x_thermal: " Sinan Kaya
2019-01-05 10:06 ` 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=20190105100606.6673-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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.