From 9a9e06cf8c7a894621c0ff6fbdc14f750c3d6591 Mon Sep 17 00:00:00 2001
From: Greg KH <gregkh@suse.de>
Date: Fri, 8 Apr 2005 14:53:31 +0900
Subject: [PATCH] --- yaml --- r: 855 b: refs/heads/master c:
 bc56b9e01190b9f1ad6b7c5c694b61bfe34c7aa5 h: refs/heads/master i:   853:
 6e2ded6a68f412d24d1ddac9c23757af9553e74f   851:
 5dab5af213d01b46fcbd1d22663cc65a7295bb65   847:
 041064037967cc3aa42cc2f671612f1ebfaf6f29 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pci/pci-acpi.c | 2 +-
 trunk/drivers/pci/pci.c      | 1 +
 trunk/drivers/pci/probe.c    | 1 +
 trunk/drivers/pci/proc.c     | 1 +
 trunk/drivers/pci/quirks.c   | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index da8fc9d0e828..d160e361ea32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92df516e6264f9caff4be49718926d6884fa50ed
+refs/heads/master: bc56b9e01190b9f1ad6b7c5c694b61bfe34c7aa5
diff --git a/trunk/drivers/pci/pci-acpi.c b/trunk/drivers/pci/pci-acpi.c
index 968eb32f292d..bc01d34e2634 100644
--- a/trunk/drivers/pci/pci-acpi.c
+++ b/trunk/drivers/pci/pci-acpi.c
@@ -19,7 +19,7 @@
 
 static u32 ctrlset_buf[3] = {0, 0, 0};
 static u32 global_ctrlsets = 0;
-u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
+static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
 
 static acpi_status  
 acpi_query_osc (
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index fc8cc6c53778..88cbe5b5b3f3 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <asm/dma.h>	/* isa_dma_bridge_buggy */
+#include "pci.h"
 
 
 /**
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index 6f0edadd132c..b7ae87823c69 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/drivers/pci/probe.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/cpumask.h>
+#include "pci.h"
 
 #define CARDBUS_LATENCY_TIMER	176	/* secondary latency timer */
 #define CARDBUS_RESERVE_BUSNR	3
diff --git a/trunk/drivers/pci/proc.c b/trunk/drivers/pci/proc.c
index 84cc4f620d8d..e68bbfb1e7c3 100644
--- a/trunk/drivers/pci/proc.c
+++ b/trunk/drivers/pci/proc.c
@@ -15,6 +15,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
+#include "pci.h"
 
 static int proc_initialized;	/* = 0 */
 
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 15a398051682..00388a14a3c6 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include "pci.h"
 
 /* Deal with broken BIOS'es that neglect to enable passive release,
    which can cause problems in combination with the 82441FX/PPro MTRRs */