diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-01 00:35:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-01 00:35:04 -0500 |
commit | 500156a0f0e81e24991f5f0db56e859db1fbdacf (patch) | |
tree | 0167cb28731e2c6fd7da2ea21f301312eea6504a /drivers/mmc/mmci.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/mmci.c')
-rw-r--r-- | drivers/mmc/mmci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 9fef29d978b5..df7e861e2fc7 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
@@ -33,12 +33,8 @@ | |||
33 | 33 | ||
34 | #define DRIVER_NAME "mmci-pl18x" | 34 | #define DRIVER_NAME "mmci-pl18x" |
35 | 35 | ||
36 | #ifdef CONFIG_MMC_DEBUG | ||
37 | #define DBG(host,fmt,args...) \ | 36 | #define DBG(host,fmt,args...) \ |
38 | pr_debug("%s: %s: " fmt, mmc_hostname(host->mmc), __func__ , args) | 37 | pr_debug("%s: %s: " fmt, mmc_hostname(host->mmc), __func__ , args) |
39 | #else | ||
40 | #define DBG(host,fmt,args...) do { } while (0) | ||
41 | #endif | ||
42 | 38 | ||
43 | static unsigned int fmax = 515633; | 39 | static unsigned int fmax = 515633; |
44 | 40 | ||