--- arm/at91/at91_spi.c	(revision 192322)
+++ arm/at91/at91_spi.c	(local)
@@ -297,7 +297,7 @@
 };
 
 static driver_t at91_spi_driver = {
-	"at91_spi",
+	"spi",
 	at91_spi_methods,
 	sizeof(struct at91_spi_softc),
 };
--- dev/flash/at45d.c	(revision 192322)
+++ dev/flash/at45d.c	(local)
@@ -30,7 +30,6 @@
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/gpio.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
--- dev/spibus/spibus.c	(revision 192322)
+++ dev/spibus/spibus.c	(local)
@@ -194,5 +194,5 @@
 
 devclass_t	spibus_devclass;
 
-DRIVER_MODULE(spibus, at91_spi, spibus_driver, spibus_devclass, 0, 0);
+DRIVER_MODULE(spibus, spi, spibus_driver, spibus_devclass, 0, 0);
 MODULE_VERSION(spibus, 1);