From e4d6714811a85687b763395e62a9159d09d33abd Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 8 Dec 2008 21:30:31 -0700
Subject: [PATCH] --- yaml --- r: 128103 b: refs/heads/master c:
 f748bafa3ca1fb056e63afdeecacc1c68d8104df h: refs/heads/master i:   128101:
 172ef4cc6afaf482f99f4aa44074c08915e37b9e   128099:
 25311fb13bb8d0f8b28647d973df2e5765014f84   128095:
 a2db82da1ddb0e4bf0c089789daacd28adf1c8fc v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/acpi/pci_irq.c | 16 ++++++++++++++++
 trunk/include/linux/acpi.h   | 16 ----------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 5c3b8c2851c4..66912903bcde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c13f889a24e6ced50abb582dab3ee4b7c79b038e
+refs/heads/master: f748bafa3ca1fb056e63afdeecacc1c68d8104df
diff --git a/trunk/drivers/acpi/pci_irq.c b/trunk/drivers/acpi/pci_irq.c
index 9302f4bb89e2..ea003bab7ecd 100644
--- a/trunk/drivers/acpi/pci_irq.c
+++ b/trunk/drivers/acpi/pci_irq.c
@@ -41,6 +41,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/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
index fba8051fb297..813f937b3ab4 100644
--- a/trunk/include/linux/acpi.h
+++ b/trunk/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);