From e2871fe503949937d1c40ef49fb76c8d2b9b3158 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Mon, 28 Jan 2008 21:06:55 +1100
Subject: [PATCH] --- yaml --- r: 91507 b: refs/heads/master c:
 4df4441e418c809f263939b9f371b67aca28a280 h: refs/heads/master i:   91505:
 bce29086eaeeafa1c621491107a59e813b917ccf   91503:
 0d70f12211fc7d46926c8f7a57a331259fcfbeae v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kernel/isa-bridge.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 628b89494818..c61d94891f25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a07e387ae3a830106d0463ec254657f297b97ea0
+refs/heads/master: 4df4441e418c809f263939b9f371b67aca28a280
diff --git a/trunk/arch/powerpc/kernel/isa-bridge.c b/trunk/arch/powerpc/kernel/isa-bridge.c
index d73551da2ff1..289af348978d 100644
--- a/trunk/arch/powerpc/kernel/isa-bridge.c
+++ b/trunk/arch/powerpc/kernel/isa-bridge.c
@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
 	 *			(size depending on dev->n_addr_cells)
 	 *   cell 5:		the size of the range
 	 */
-	if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) {
+	if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) {
 		range++;
 		rlen -= sizeof(struct isa_range);
 		if (rlen < sizeof(struct isa_range))
 			goto inval_range;
 	}
-	if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO)
+	if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO)
 		goto inval_range;
 
 	isa_addr = range->isa_addr.a_lo;