[oe-commits] Martin Jansa : shr/merge: Drop patch as its fixed better upstream.

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: be599dd141a9543a8213020a706903c60bde4920
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=be599dd141a9543a8213020a706903c60bde4920

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Mon Oct 19 07:36:08 2009 +0000

shr/merge: Drop patch as its fixed better upstream.

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../0001-Check-pScrn-variable-before-usage.patch   |   42 --------------------
 recipes/xorg-driver/xf86-video-glamo-kms_git.bb    |    3 +-
 2 files changed, 1 insertions(+), 44 deletions(-)

diff --git a/recipes/xorg-driver/xf86-video-glamo-kms/0001-Check-pScrn-variable-before-usage.patch b/recipes/xorg-driver/xf86-video-glamo-kms/0001-Check-pScrn-variable-before-usage.patch
deleted file mode 100644
index 5f24097..0000000
--- a/recipes/xorg-driver/xf86-video-glamo-kms/0001-Check-pScrn-variable-before-usage.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e5156b9c23a65abede157df55c143e3cbc67ac61 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa at gmail.com>
-Date: Sat, 17 Oct 2009 02:18:56 +0200
-Subject: [PATCH] Check pScrn variable before usage
-
----
- src/glamo-driver.c |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/glamo-driver.c b/src/glamo-driver.c
-index e8d39f6..82c6a0c 100644
---- a/src/glamo-driver.c
-+++ b/src/glamo-driver.c
-@@ -367,7 +367,7 @@ GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
- static Bool
- GlamoProbe(DriverPtr drv, int flags)
- {
--	ScrnInfoPtr pScrn;
-+	ScrnInfoPtr pScrn = NULL;
- 	GDevPtr *devSections;
- 	int numDevSections;
- 	Bool foundScreen = FALSE;
-@@ -384,10 +384,14 @@ GlamoProbe(DriverPtr drv, int flags)
- 	/* Is today a good day to use KMS? */
- 	if ( GlamoKernelModesettingAvailable() ) {
- 		foundScreen = GlamoKMSProbe(drv, devSections, numDevSections);
--		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using KMS!\n");
-+		if ( pScrn ) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using KMS!\n");
-+		}
- 	} else {
- 		foundScreen = GlamoFbdevProbe(drv, devSections, numDevSections);
--		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using KMS\n");
-+		if ( pScrn ) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using KMS\n");
-+		}
- 	}
- 
- 	xfree(devSections);
--- 
-1.6.5
-
diff --git a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
index 04e716f..6ab5991 100644
--- a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
@@ -1,6 +1,5 @@
 require xorg-driver-video.inc
-SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=kms \
-           file://0001-Check-pScrn-variable-before-usage.patch;patch=1"
+SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=kms"
 
 S = "${WORKDIR}/git"