diff --git a/[refs] b/[refs]
index 239da547edc5..b4ad1a4c5943 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a0c50c07a6100ca58d465bac951533347e18d71
+refs/heads/master: dd11b8cdf0c455f4cfbc5daa70aabce9dcc6c07b
diff --git a/trunk/drivers/mtd/nand/at91_nand.c b/trunk/drivers/mtd/nand/at91_nand.c
index a58ed3763086..14b80cc90a7b 100644
--- a/trunk/drivers/mtd/nand/at91_nand.c
+++ b/trunk/drivers/mtd/nand/at91_nand.c
@@ -128,6 +128,9 @@ static int __init at91_nand_probe(struct platform_device *pdev)
 	nand_chip->ecc.mode = NAND_ECC_SOFT;	/* enable ECC */
 	nand_chip->chip_delay = 20;		/* 20us command delay time */
 
+	if (host->board->bus_width_16)		/* 16-bit bus width */
+		nand_chip->options |= NAND_BUSWIDTH_16;
+
 	platform_set_drvdata(pdev, host);
 	at91_nand_enable(host);