---

yaml --- r: 223665 b: refs/heads/master c: acd0acb h: refs/heads/master i: 223663: ca31b9b v: v3
git-mirror · Dec 24, 2010 · d1c527a · d1c527a
1 parent 9fd448f
commit d1c527a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c1ac08b38af0c477ae32df9f4625b7dbddea1ea
+refs/heads/master: acd0acb65ec907a9e872bbaa7ad811a518b49b45
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
@@ -1458,7 +1458,7 @@ static bool apertures_overlap(struct aperture *gen, struct aperture *hw)
 	if (gen->base == hw->base)
 		return true;
 	/* is the generic aperture base inside the hw base->hw base+size */
-	if (gen->base > hw->base && gen->base <= hw->base + hw->size)
+	if (gen->base > hw->base && gen->base < hw->base + hw->size)
 		return true;
 	return false;
 }