From b4c75814974b1ff7127469ed7e4a115645e2c8af Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Fri, 13 Nov 2009 17:34:44 -0700
Subject: [PATCH] --- yaml --- r: 174815 b: refs/heads/master c:
 987c367b4e93be6826394e7c9cc14d28bb5c8810 h: refs/heads/master i:   174813:
 39c5d790d3cfe176ddb780c33a903483650b6d3e   174811:
 5ced7041c035dcd0e4fd25f539b1642c824bd9dc   174807:
 67ac2103611151d4057c4e2abf58bdbbb1fcc11b   174799:
 8b12a003d2a2f65aeaaffddbd60e018f09bc3126   174783:
 0b21ed383aa593349ab1ea155631e54ef985b39d v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/pci/mmconfig-shared.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 88580f9b7192..e4a7f383c1a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0f5503926f7447615f083c2d57545a83b6357c
+refs/heads/master: 987c367b4e93be6826394e7c9cc14d28bb5c8810
diff --git a/trunk/arch/x86/pci/mmconfig-shared.c b/trunk/arch/x86/pci/mmconfig-shared.c
index 90422b4a7c91..6eeeac0d25f4 100644
--- a/trunk/arch/x86/pci/mmconfig-shared.c
+++ b/trunk/arch/x86/pci/mmconfig-shared.c
@@ -277,8 +277,8 @@ static struct pci_mmcfg_hostbridge_probe pci_mmcfg_probes[] __initdata = {
 
 static int __init cmp_mmcfg(const void *x1, const void *x2)
 {
-	const typeof(pci_mmcfg_config[0]) *m1 = x1;
-	const typeof(pci_mmcfg_config[0]) *m2 = x2;
+	const struct pci_mmcfg_region *m1 = x1;
+	const struct pci_mmcfg_region *m2 = x2;
 	int start1, start2;
 
 	start1 = m1->start_bus;
@@ -290,7 +290,7 @@ static int __init cmp_mmcfg(const void *x1, const void *x2)
 static void __init pci_mmcfg_check_end_bus_number(void)
 {
 	int i;
-	typeof(pci_mmcfg_config[0]) *cfg, *cfgx;
+	struct pci_mmcfg_region *cfg, *cfgx;
 
 	/* sort them at first */
 	sort(pci_mmcfg_config, pci_mmcfg_config_num,
@@ -438,7 +438,7 @@ static int __init is_acpi_reserved(u64 start, u64 end, unsigned not_used)
 typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type);
 
 static int __init is_mmconf_reserved(check_reserved_t is_reserved,
-		int i, typeof(pci_mmcfg_config[0]) *cfg, int with_e820)
+		int i, struct pci_mmcfg_region *cfg, int with_e820)
 {
 	u64 addr = cfg->res.start;
 	u64 size = resource_size(&cfg->res);
@@ -479,7 +479,7 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved,
 
 static void __init pci_mmcfg_reject_broken(int early)
 {
-	typeof(pci_mmcfg_config[0]) *cfg;
+	struct pci_mmcfg_region *cfg;
 	int i;
 
 	if (pci_mmcfg_config_num == 0)