diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 21:35:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 21:35:46 -0800 |
commit | ae2dc032773da914911f4e2a6075f31d1cbc9ca0 (patch) | |
tree | c6ef50f480be3c60ca64fc378ef67fd79b313f1a /drivers/pcmcia/i82092aa.h | |
parent | Merge tag 'spi-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
parent | pcmcia: remove unused dprintk definition (diff) | |
download | linux-dev-ae2dc032773da914911f4e2a6075f31d1cbc9ca0.tar.xz linux-dev-ae2dc032773da914911f4e2a6075f31d1cbc9ca0.zip |
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull pcmcia updates from Dominik Brodowski:
"Just a few odd fixes and improvements to the PCMCIA core"
* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: remove unused dprintk definition
pcmcia: include <pcmcia/ds.h> for pcmcia_parse_tuple
pcmcia: include cs_internal.h for missing declarations
pcmcia: Use dev_get_drvdata where possible
pcmcia: clean an indentation issues, remove extraneous spaces
Diffstat (limited to 'drivers/pcmcia/i82092aa.h')
-rw-r--r-- | drivers/pcmcia/i82092aa.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pcmcia/i82092aa.h b/drivers/pcmcia/i82092aa.h index fabe08c3e33d..4586c43c78e2 100644 --- a/drivers/pcmcia/i82092aa.h +++ b/drivers/pcmcia/i82092aa.h @@ -8,11 +8,9 @@ #ifdef NOTRACE #define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__) #define leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__) -#define dprintk(fmt, args...) printk(fmt , ## args) #else #define enter(x) do {} while (0) #define leave(x) do {} while (0) -#define dprintk(fmt, args...) do {} while (0) #endif |