diff --git a/CHANGELOG b/CHANGELOG
index a21526b971..d2d5324c11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* CFG_NAND_QUIET_TEST added to not warn upon missing NAND device
+  Patch by Stefan Roese, 07 Oct 2006
+
 * Update ALPR code (NAND support working now)
   Patch by Stefan Roese, 07 Oct 2006
 
diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c
index b7a5d32fb3..b0030857c6 100644
--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@@ -2407,7 +2407,9 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
 	}
 
 	if (!nand_flash_ids[i].name) {
+#ifndef CFG_NAND_QUIET_TEST
 		printk (KERN_WARNING "No NAND device found!!!\n");
+#endif
 		this->select_chip(mtd, -1);
 		return 1;
 	}