diff --git a/[refs] b/[refs]
index b446d00cef66..70c912624507 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e150d6e725c014d72106a8610be40b7b08beb77a
+refs/heads/master: 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984
diff --git a/trunk/drivers/mtd/nand/atmel_nand.c b/trunk/drivers/mtd/nand/atmel_nand.c
index 325ce29f53fc..50700ab5a57a 100644
--- a/trunk/drivers/mtd/nand/atmel_nand.c
+++ b/trunk/drivers/mtd/nand/atmel_nand.c
@@ -29,8 +29,8 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/gpio.h>
-#include <asm/io.h>
+#include <linux/gpio.h>
+#include <linux/io.h>
 
 #include <asm/arch/board.h>
 
@@ -444,7 +444,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 	if (host->board->det_pin) {
 		if (gpio_get_value(host->board->det_pin)) {
-			printk ("No SmartMedia card inserted.\n");
+			printk("No SmartMedia card inserted.\n");
 			res = ENXIO;
 			goto err_no_card;
 		}