summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-07-10 09:09:45 +0200
committerStefan Roese <sr@denx.de>2008-07-10 09:09:45 +0200
commitac5ba41c2234dd513ed2c879914e964cc05a0135 (patch)
treeeea25003c17267efc504264bc1faa419a355a138 /include/linux
parent7c6237b3e2f2ee0098897da39b79aff4642b8946 (diff)
parent4188f0491886b3b486164e819c0a83fdb97efd7d (diff)
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/linux')
-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 */