diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index 8b2d609ebb1..6678d5db9b8 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -128,12 +128,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) diff --git a/sys/arm/at91/std.atmel b/sys/arm/at91/std.atmel index fc1e968387c..222fda76870 100644 --- a/sys/arm/at91/std.atmel +++ b/sys/arm/at91/std.atmel @@ -12,4 +12,3 @@ device at91sam9x5 # bring in the sam specific timers and such device at91sam9 -options ARM_DEVICE_MULTIPASS diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 545cb451650..fd32e52e854 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -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