From owner-svn-src-all@FreeBSD.ORG  Mon Jun 11 21:38:37 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 10F98106564A;
	Mon, 11 Jun 2012 21:38:37 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F03928FC14;
	Mon, 11 Jun 2012 21:38:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5BLcasb011758;
	Mon, 11 Jun 2012 21:38:36 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BLcaTd011756;
	Mon, 11 Jun 2012 21:38:36 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206112138.q5BLcaTd011756@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 11 Jun 2012 21:38:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236928 - stable/9/sys/dev/pci
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, 11 Jun 2012 21:38:37 -0000

Author: kib
Date: Mon Jun 11 21:38:36 2012
New Revision: 236928
URL: http://svn.freebsd.org/changeset/base/236928

Log:
  MFC r235846:
  Add 'drmn' device as another drm child, to allow drm2 drivers to live
  in parallel with drm1.

Modified:
  stable/9/sys/dev/pci/vga_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/pci/vga_pci.c
==============================================================================
--- stable/9/sys/dev/pci/vga_pci.c	Mon Jun 11 21:35:27 2012	(r236927)
+++ stable/9/sys/dev/pci/vga_pci.c	Mon Jun 11 21:38:36 2012	(r236928)
@@ -105,6 +105,7 @@ vga_pci_attach(device_t dev)
 
 	/* Always create a drm child for now to make it easier on drm. */
 	device_add_child(dev, "drm", -1);
+	device_add_child(dev, "drmn", -1);
 	bus_generic_attach(dev);
 	return (0);
 }