From owner-svn-src-all@FreeBSD.ORG  Mon Oct 19 23:09:39 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 546F6106568B;
	Mon, 19 Oct 2009 23:09:39 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 431EA8FC1B;
	Mon, 19 Oct 2009 23:09:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JN9d8m023242;
	Mon, 19 Oct 2009 23:09:39 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9JN9doS023240;
	Mon, 19 Oct 2009 23:09:39 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200910192309.n9JN9doS023240@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 19 Oct 2009 23:09:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198259 - head/sys/dev/dpms
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2009 23:09:39 -0000

Author: jkim
Date: Mon Oct 19 23:09:39 2009
New Revision: 198259
URL: http://svn.freebsd.org/changeset/base/198259

Log:
  Remove a redundant option ROM check, which was never meant to be committed.

Modified:
  head/sys/dev/dpms/dpms.c

Modified: head/sys/dev/dpms/dpms.c
==============================================================================
--- head/sys/dev/dpms/dpms.c	Mon Oct 19 21:54:41 2009	(r198258)
+++ head/sys/dev/dpms/dpms.c	Mon Oct 19 23:09:39 2009	(r198259)
@@ -129,9 +129,8 @@ dpms_identify(driver_t *driver, device_t
 	if (devclass_get_device(dpms_devclass, 0) != NULL)
 		return;
 
-	if ((x86bios_match_device(0xc0000, parent) &&
-	    device_get_flags(parent) != 0) ||
-	    x86bios_get_orm(0xc0000) != NULL)
+	if (x86bios_match_device(0xc0000, parent) &&
+	    device_get_flags(parent) != 0)
 		device_add_child(parent, "dpms", 0);
 }