devices -> drivers

Makefile

@@ -30,7 +30,7 @@ KOBJS :=
 
 # Initialize sub-directory Makefile inclusion
 BASEDIR = $(shell pwd)
-SUBDIRS := boot kernel devices
+SUBDIRS := boot kernel drivers
 ifneq (,$(SUBDIRS))
 	include $(patsubst %,%/kernel.mk,$(SUBDIRS))
 endif

drivers/bcm2835_videocore.c

@@ -22,7 +22,7 @@
 #include <framebuffer.h>
 #include <kmalloc.h>
 #include <print.h>
-#include <devices/bcm2835_mailbox.h>
+#include <drivers/bcm2835_mailbox.h>
 
 struct bcm2835_config {
 	uint32 width;

drivers/kernel.mk

@@ -1,4 +1,4 @@
-DIRNAME := devices
+DIRNAME := drivers
 SUBDIRS :=
 
 include $(BASEDIR)/header.mk

kernel/start_kernel.c

@@ -27,13 +27,13 @@
 #include <console.h>
 
 #ifdef CONFIG_VEXPRESS_A9
-#include <devices/pl011.h>
-#include <devices/pl111.h>
+#include <drivers/pl011.h>
+#include <drivers/pl111.h>
 #endif
 
 #ifdef CONFIG_RPI
-#include <devices/pi_mini_uart.h>
-#include <devices/bcm2835_videocore.h>
+#include <drivers/pi_mini_uart.h>
+#include <drivers/bcm2835_videocore.h>
 #endif
 
 struct fb myfb;