From d1c527a8bc03b3e6974672b0049997852ced0915 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 21 Dec 2010 01:41:15 +0000
Subject: [PATCH] --- yaml --- r: 223665 b: refs/heads/master c:
 acd0acb65ec907a9e872bbaa7ad811a518b49b45 h: refs/heads/master i:   223663:
 ca31b9b67b3f7fa19a11d2d74291483443f185e6 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4ba171423155..0e2ed7ee2185 100644
--- 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
index 0e6aa3d96a42..4ac1201ad6c2 100644
--- 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;
 }