[PATCH 06/20] ACPI: PCI: move struct acpi_prt_entry declaration out of public header file

Bjorn Helgaas
2008-12-09T04:30:31Z

The struct acpi_prt_entry is used only in pci_irq.c, so there's no
need for the declaration to be public. This patch moves it into
pci_irq.c.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/acpi/pci_irq.c | 16 ++++++++++++++++
include/linux/acpi.h | 16 ----------------
2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index f80b8a2..04b9df4 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -43,6 +43,22 @@
#define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_irq");

+struct acpi_prt_entry {
+ struct list_head node;
+ struct acpi_pci_id id;
+ u8 pin;
+ struct {
+ acpi_handle handle;
+ u32 index;
+ } link;
+ u32 irq;
+};
+
+struct acpi_prt_list {
+ int count;
+ struct list_head entries;
+};
+
static struct acpi_prt_list acpi_prt;
static DEFINE_SPINLOCK(acpi_prt_lock);

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fba8051..813f937 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -131,22 +131,6 @@ extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity);
*/
void acpi_unregister_gsi (u32 gsi);

-struct acpi_prt_entry {
- struct list_head node;
- struct acpi_pci_id id;
- u8 pin;
- struct {
- acpi_handle handle;
- u32 index;
- } link;
- u32 irq;
-};
-
-struct acpi_prt_list {
- int count;
- struct list_head entries;
-};
-
struct pci_dev;

int acpi_pci_irq_enable (struct pci_dev *dev);