Merge l2-mtd/next into l2-mtd/master

[linux-2.6-block.git] / include / linux / mtd / nand.h

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index b7c11991cb09b62e10b41ac5e8c6790737e5417e..8acb307b6fde7de195a495078ea22a5c9c52c32b 100644 (file)
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -950,7 +950,7 @@ static inline int jedec_feature(struct nand_chip *chip)
                : 0;
 }
 
-/**
+/*
  * struct nand_sdr_timings - SDR NAND chip timings
  *
  * This struct defines the timing requirements of a SDR NAND chip.