From 6e7239aaffc558b4adbedce197aa56157b717e91 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 22 Nov 2006 18:26:22 +1100
Subject: [PATCH] --- yaml --- r: 44814 b: refs/heads/master c:
 beb7cc8238a8334d86c96bf32bf66182db3b619f h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/sysdev/mpic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2fbfee770c86..c5efb8811d1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a380507c48f7894bae7d367375313df9d51b2e5
+refs/heads/master: beb7cc8238a8334d86c96bf32bf66182db3b619f
diff --git a/trunk/arch/powerpc/sysdev/mpic.c b/trunk/arch/powerpc/sysdev/mpic.c
index 411480d5c626..d01ced11694d 100644
--- a/trunk/arch/powerpc/sysdev/mpic.c
+++ b/trunk/arch/powerpc/sysdev/mpic.c
@@ -390,7 +390,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
 		u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
 		if (id == PCI_CAP_ID_HT) {
 			id = readb(devbase + pos + 3);
-			if (id == HT_CAPTYPE_IRQ)
+			if ((id & HT_5BIT_CAP_MASK) == HT_CAPTYPE_IRQ)
 				break;
 		}
 	}