From 0d40346b4c34e9fdb10341d002dd5b2dbc49cea2 Mon Sep 17 00:00:00 2001
From: Ming Lei <tom.leiming@gmail.com>
Date: Wed, 16 Jul 2008 22:54:30 +0800
Subject: [PATCH] --- yaml --- r: 102291 b: refs/heads/master c:
 9fce1bc956c21dfe0f46be028f18c4d5057f2bd7 h: refs/heads/master i:   102289:
 1285524bd9b91b77a6344d1e9ef5540db8d29fc7   102287:
 942afaefd14a629178b955ddb5ffbf7a6f7e260a v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/pci/hotplug/pciehp.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2180f2d9ea5f..cfc0e43f1bf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 809d9a8f93bd8504dcc34b16bbfdfd1a8c9bb1ed
+refs/heads/master: 9fce1bc956c21dfe0f46be028f18c4d5057f2bd7
diff --git a/trunk/drivers/pci/hotplug/pciehp.h b/trunk/drivers/pci/hotplug/pciehp.h
index d17233ae06f5..e3a1e7e7dba2 100644
--- a/trunk/drivers/pci/hotplug/pciehp.h
+++ b/trunk/drivers/pci/hotplug/pciehp.h
@@ -97,7 +97,7 @@ struct controller {
 	u32 slot_cap;
 	u8 cap_base;
 	struct timer_list poll_timer;
-	volatile int cmd_busy;
+	int cmd_busy;
 	unsigned int no_cmd_complete:1;
 };