Merge branch 'merge' of git://www.denx.de/git/u-boot-microblaze

[oweals/u-boot.git] / drivers / nand / diskonchip.c

diff --git a/drivers/nand/diskonchip.c b/drivers/nand/diskonchip.c
index b421d4c1c36c34b83fca1dad5c96e3178da90820..e17af70d07fa1075f21c9e5b61fd31eb27b4a80f 100644 (file)
--- a/drivers/nand/diskonchip.c
+++ b/drivers/nand/diskonchip.c
@@ -19,6 +19,10 @@
  * $Id: diskonchip.c,v 1.45 2005/01/05 18:05:14 dwmw2 Exp $
  */
 
+#include <common.h>
+
+#if !defined(CFG_NAND_LEGACY)
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -1780,3 +1784,4 @@ module_exit(cleanup_nanddoc);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
 MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver\n");
+#endif