diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 21:35:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 21:35:04 -0800 |
commit | 500156a0f0e81e24991f5f0db56e859db1fbdacf (patch) | |
tree | 0167cb28731e2c6fd7da2ea21f301312eea6504a /drivers/mmc/wbsd.c | |
parent | 5b67e8dd5ae889fea7d01b905a570fa9a37b8785 (diff) | |
parent | c65631781eb0f2e81865017c1484e9aef76e1b61 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] Pass -DDEBUG on compiler command line if MMC_DEBUG selected
[MMC] Add OMAP MMC host driver
Diffstat (limited to 'drivers/mmc/wbsd.c')
-rw-r--r-- | drivers/mmc/wbsd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 3be397d436f..511f7b0b31d 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -44,15 +44,10 @@ #define DRIVER_NAME "wbsd" #define DRIVER_VERSION "1.5" -#ifdef CONFIG_MMC_DEBUG #define DBG(x...) \ - printk(KERN_DEBUG DRIVER_NAME ": " x) + pr_debug(DRIVER_NAME ": " x) #define DBGF(f, x...) \ - printk(KERN_DEBUG DRIVER_NAME " [%s()]: " f, __func__ , ##x) -#else -#define DBG(x...) do { } while (0) -#define DBGF(x...) do { } while (0) -#endif + pr_debug(DRIVER_NAME " [%s()]: " f, __func__ , ##x) /* * Device resources |