svn commit: r274268 - in stable/10/sys: arm/arm arm/at91 conf

[Ian Lepore]

Author: ian
Date: Sat Nov  8 03:42:19 2014
New Revision: 274268
URL: https://svnweb.freebsd.org/changeset/base/274268

Log:
  MFC r273703:
  
    Remove the ARM_DEVICE_MULTIPASS option and make its effect be the default.

Modified:
  stable/10/sys/arm/arm/nexus.c
  stable/10/sys/arm/at91/std.atmel
  stable/10/sys/conf/options.arm
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/arm/nexus.c
==============================================================================
--- stable/10/sys/arm/arm/nexus.c	Sat Nov  8 03:20:56 2014	(r274267)
+++ stable/10/sys/arm/arm/nexus.c	Sat Nov  8 03:42:19 2014	(r274268)
@@ -125,12 +125,8 @@ static driver_t nexus_driver = {
 	nexus_methods,
 	1			/* no softc */
 };
-#ifdef ARM_DEVICE_MULTIPASS
 EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, 
     BUS_PASS_BUS + BUS_PASS_ORDER_EARLY);
-#else
-DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
-#endif
 
 static int
 nexus_probe(device_t dev)

Modified: stable/10/sys/arm/at91/std.atmel
==============================================================================
--- stable/10/sys/arm/at91/std.atmel	Sat Nov  8 03:20:56 2014	(r274267)
+++ stable/10/sys/arm/at91/std.atmel	Sat Nov  8 03:42:19 2014	(r274268)
@@ -11,3 +11,4 @@ device		at91sam9x5
 
 # bring in the sam specific timers and such
 device		at91sam9
+

Modified: stable/10/sys/conf/options.arm
==============================================================================
--- stable/10/sys/conf/options.arm	Sat Nov  8 03:20:56 2014	(r274267)
+++ stable/10/sys/conf/options.arm	Sat Nov  8 03:42:19 2014	(r274268)
@@ -1,7 +1,6 @@
 #$FreeBSD$
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
-ARM_DEVICE_MULTIPASS	opt_global.h
 ARM_KERN_DIRECTMAP	opt_vm.h
 ARM_L2_PIPT		opt_global.h
 ARM_MANY_BOARD		opt_global.h