From 4c339abdfdd31b781c3a10a93a73362324566ef0 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 4 Jan 2012 15:49:45 -0800
Subject: [PATCH] --- yaml --- r: 283396 b: refs/heads/master c:
 cda57bf9348fdbf4b8a830d6f9eb7da81df2f486 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/pci.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1beeb8a93c2..3683b3c5f465 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aecab53f45b84fbc7d6848957f9d83e1c3548b17
+refs/heads/master: cda57bf9348fdbf4b8a830d6f9eb7da81df2f486
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 174fe8aabdde..5d06e340da9a 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -111,7 +111,7 @@ enum {
 	PCI_NUM_RESOURCES,
 
 	/* preserve this for compatibility */
-	DEVICE_COUNT_RESOURCE
+	DEVICE_COUNT_RESOURCE = PCI_NUM_RESOURCES,
 };
 
 typedef int __bitwise pci_power_t;