svn commit: r299392 - head/sys/x86/isa

[Bjoern A. Zeeb]

Author: bz
Date: Tue May 10 22:28:06 2016
New Revision: 299392
URL: https://svnweb.freebsd.org/changeset/base/299392

Log:
  Allow orm(4) to be disabled from probing/attaching by a hints entry:
  hint.orm.0.disabled=1
  
  Suggested by:	jhb
  Reviewed by:	jhb
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D6307

Modified:
  head/sys/x86/isa/orm.c

Modified: head/sys/x86/isa/orm.c
==============================================================================
--- head/sys/x86/isa/orm.c	Tue May 10 22:25:55 2016	(r299391)
+++ head/sys/x86/isa/orm.c	Tue May 10 22:28:06 2016	(r299392)
@@ -91,6 +91,9 @@ orm_identify(driver_t* driver, device_t 
 	struct orm_softc	*sc;
 	u_int8_t		buf[3];
 
+	if (resource_disabled("orm", 0))
+		return;
+
 	child = BUS_ADD_CHILD(parent, ISA_ORDER_SENSITIVE, "orm", -1);
 	device_set_driver(child, driver);
 	isa_set_logicalid(child, ORM_ID);