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/sdhci.c | |
| parent | 5b67e8dd5ae889fea7d01b905a570fa9a37b8785 (diff) | |
| parent | c65631781eb0f2e81865017c1484e9aef76e1b61 (diff) | |
| download | linux-500156a0f0e81e24991f5f0db56e859db1fbdacf.tar.gz linux-500156a0f0e81e24991f5f0db56e859db1fbdacf.tar.bz2 linux-500156a0f0e81e24991f5f0db56e859db1fbdacf.zip | |
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/sdhci.c')
| -rw-r--r-- | drivers/mmc/sdhci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 8b811d94371c..bdbfca050029 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -31,12 +31,8 @@ #define BUGMAIL "<sdhci-devel@list.drzeus.cx>" -#ifdef CONFIG_MMC_DEBUG #define DBG(f, x...) \ - printk(KERN_DEBUG DRIVER_NAME " [%s()]: " f, __func__,## x) -#else -#define DBG(f, x...) do { } while (0) -#endif + pr_debug(DRIVER_NAME " [%s()]: " f, __func__,## x) static const struct pci_device_id pci_ids[] __devinitdata = { /* handle any SD host controller */ |