diff --git a/src/flash/nand/driver.c b/src/flash/nand/driver.c
index 5d99102c8..69b3ba961 100644
--- a/src/flash/nand/driver.c
+++ b/src/flash/nand/driver.c
@@ -14,20 +14,21 @@
 #include "driver.h"
 
 static struct nand_flash_controller *nand_flash_controllers[] = {
-	&nonce_nand_controller,
+	// Keep in alphabetic order the list of drivers
+	&at91sam9_nand_controller,
 	&davinci_nand_controller,
+	&imx31_nand_flash_controller,
 	&lpc3180_nand_controller,
 	&lpc32xx_nand_controller,
+	&mxc_nand_flash_controller,
+	&nonce_nand_controller,
+	&nuc910_nand_controller,
 	&orion_nand_controller,
 	&s3c2410_nand_controller,
 	&s3c2412_nand_controller,
 	&s3c2440_nand_controller,
 	&s3c2443_nand_controller,
 	&s3c6400_nand_controller,
-	&mxc_nand_flash_controller,
-	&imx31_nand_flash_controller,
-	&at91sam9_nand_controller,
-	&nuc910_nand_controller,
 	NULL
 };
 
diff --git a/src/flash/nand/driver.h b/src/flash/nand/driver.h
index 4e84f10fb..d26e77c75 100644
--- a/src/flash/nand/driver.h
+++ b/src/flash/nand/driver.h
@@ -89,6 +89,7 @@ typedef int (*nand_driver_walker_t)(struct nand_flash_controller *c, void *);
  */
 int nand_driver_walk(nand_driver_walker_t f, void *x);
 
+// Keep in alphabetic order the list of drivers
 extern struct nand_flash_controller at91sam9_nand_controller;
 extern struct nand_flash_controller davinci_nand_controller;
 extern struct nand_flash_controller imx31_nand_flash_controller;