From 9af4967e26192413078a37b9bdfa993a11d5c46c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 22 Sep 2008 15:42:24 -0700
Subject: [PATCH] --- yaml --- r: 109954 b: refs/heads/master c:
 44b50e5a1af13c605d6c3b17a60e42eb0ee48d5f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc64/kernel/pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0937c4a9eb08..eca911edfc8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ee766d8fba9dfd93bf3eca7a8d84a25404a68dc
+refs/heads/master: 44b50e5a1af13c605d6c3b17a60e42eb0ee48d5f
diff --git a/trunk/arch/sparc64/kernel/pci.c b/trunk/arch/sparc64/kernel/pci.c
index 55096195458f..80dad76f8b81 100644
--- a/trunk/arch/sparc64/kernel/pci.c
+++ b/trunk/arch/sparc64/kernel/pci.c
@@ -425,7 +425,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
 	dev->current_state = 4;		/* unknown power state */
 	dev->error_state = pci_channel_io_normal;
 
-	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
+	if (!strcmp(node->name, "pci")) {
 		/* a PCI-PCI bridge */
 		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
 		dev->rom_base_reg = PCI_ROM_ADDRESS1;