From 7225ce836d8608f6bd0e1abfb0b318361cc10282 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 23 Feb 2012 20:18:59 -0700
Subject: [PATCH] --- yaml --- r: 294750 b: refs/heads/master c:
 844393f4c5e309dd262b27796471c47e348b57a8 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/setup-bus.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f614e93de642..feb0d0c00be6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9c40b076c9d247494f91521e3beff9422cd1173
+refs/heads/master: 844393f4c5e309dd262b27796471c47e348b57a8
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
index 6db307fa20f5..e241f2fd6cbf 100644
--- a/trunk/drivers/pci/setup-bus.c
+++ b/trunk/drivers/pci/setup-bus.c
@@ -28,7 +28,7 @@
 #include <asm-generic/pci-bridge.h>
 #include "pci.h"
 
-unsigned int __weak pci_flags;
+unsigned int pci_flags;
 
 struct pci_dev_resource {
 	struct list_head list;