From patchwork Fri Jan 21 17:32:25 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: James Simmons <jsimmons@infradead.org>
X-Patchwork-Id: 496031
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0LHXT6u010684
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Fri, 21 Jan 2011 17:33:51 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id BAAD99EFF0
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Fri, 21 Jan 2011 09:33:28 -0800 (PST)
X-Original-To: dri-devel@lists.freedesktop.org
Delivered-To: dri-devel@lists.freedesktop.org
Received: from casper.infradead.org (casper.infradead.org [85.118.1.10])
	by gabe.freedesktop.org (Postfix) with ESMTP id 9C1FF9E7C2
	for <dri-devel@lists.freedesktop.org>;
	Fri, 21 Jan 2011 09:32:26 -0800 (PST)
Received: from localhost ([127.0.0.1])
	by casper.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux))
	id 1PgKqX-0002it-CM
	for dri-devel@lists.freedesktop.org; Fri, 21 Jan 2011 17:32:25 +0000
Date: Fri, 21 Jan 2011 17:32:25 +0000 (GMT)
From: James Simmons <jsimmons@infradead.org>
To: DRI development list <dri-devel@lists.freedesktop.org>
Subject: libdrm patches
Message-ID: <alpine.LFD.2.00.1101211727050.9667@casper.infradead.org>
User-Agent: Alpine 2.00 (LFD 1167 2008-08-23)
MIME-Version: 1.0
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
	<dri-devel.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Fri, 21 Jan 2011 17:33:51 +0000 (UTC)


diff --git a/libkms/linux.c b/libkms/linux.c
index 02182d3..bc422cc 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -101,7 +101,7 @@ linux_from_sysfs(int fd, struct kms_driver **out)
 	if (ret)
 		return ret;
 
-	if (!strcmp(name, "intel"))
+	if (!strcmp(name, "i915"))
 		ret = intel_create(fd, out);
 #ifdef HAVE_VMWGFX
 	else if (!strcmp(name, "vmwgfx"))
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ebf4853..8c4a029 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,11 +47,10 @@ TESTS =						\
 	name_from_fd				\
 	$(NULL)
 
-SUBDIRS += vbltest $(NULL)
+SUBDIRS += vbltest modeprint $(NULL)
 
 if HAVE_INTEL
 SUBDIRS += \
-	modeprint				\
 	modetest				\
 	$(NULL)
 
diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
index 2ae0fdc..c4862ac 100644
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = \
 	-I$(top_srcdir)/include/drm \
-	-I$(top_srcdir)/intel/ \
 	-I$(top_srcdir)
 
 noinst_PROGRAMS = \
@@ -9,5 +8,4 @@ noinst_PROGRAMS = \
 modeprint_SOURCES = \
 	modeprint.c
 modeprint_LDADD = \
-	$(top_builddir)/libdrm.la \
-	$(top_builddir)/intel/libdrm_intel.la
+	$(top_builddir)/libdrm.la