summaryrefslogtreecommitdiffstats
path: root/include/linux/mtd
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2008-06-20 12:38:57 -0500
committerScott Wood <scottwood@freescale.com>2008-07-09 17:24:47 -0500
commit3167c5386ea1c98b638be5d8763ef6d5938ef1bd (patch)
tree38795a04138f456c7a6c58f88c268792475fe215 /include/linux/mtd
parentc956717ab25c962ef49d49064dfc73f4edcba1fb (diff)
downloadu-boot-3167c5386ea1c98b638be5d8763ef6d5938ef1bd.tar.gz
u-boot-3167c5386ea1c98b638be5d8763ef6d5938ef1bd.tar.xz
u-boot-3167c5386ea1c98b638be5d8763ef6d5938ef1bd.zip
NAND: Rename DEBUG to MTDDEBUG to avoid namespace pollution.
This is particularly problematic now that non-NAND-specific code is including <nand.h>, and thus all debugging code is being compiled regardless of whether it was requested, as reported by Scott McNutt <smcnutt@psyent.com>. Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'include/linux/mtd')
-rw-r--r--include/linux/mtd/mtd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 71cb2d5c3b..05ba375a82 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -201,13 +201,13 @@ static inline void mtd_erase_callback(struct erase_info *instr)
#define MTD_DEBUG_LEVEL3 (3) /* Noisy */
#ifdef CONFIG_MTD_DEBUG
-#define DEBUG(n, args...) \
+#define MTDDEBUG(n, args...) \
do { \
if (n <= CONFIG_MTD_DEBUG_VERBOSE) \
printk(KERN_INFO args); \
} while(0)
#else /* CONFIG_MTD_DEBUG */
-#define DEBUG(n, args...) do { } while(0)
+#define MTDDEBUG(n, args...) do { } while(0)
#endif /* CONFIG_MTD_DEBUG */