diff options
author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2012-06-11 11:13:15 +0200 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-06 19:52:23 +0300 |
commit | ea0e627623e236e4cbec9f44b4a755bc4a4b852d (patch) | |
tree | 988cdfdaa5a8a3d6c23e8ec3d092390263599caa /drivers/usb/gadget/u_serial.c | |
parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
download | op-kernel-dev-ea0e627623e236e4cbec9f44b4a755bc4a4b852d.zip op-kernel-dev-ea0e627623e236e4cbec9f44b4a755bc4a4b852d.tar.gz |
usb: gadget: add multiple definition guards
If f_fs.c and u_serial.c are combined together using #include, which has
been a common practice so far, the pr_vdebug macro is defined multiple
times. Define it only once.
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/u_serial.c')
-rw-r--r-- | drivers/usb/gadget/u_serial.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index 5b3f5ff..da6d479 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -132,11 +132,15 @@ static unsigned n_ports; #ifdef VERBOSE_DEBUG +#ifndef pr_vdebug #define pr_vdebug(fmt, arg...) \ pr_debug(fmt, ##arg) +#endif /* pr_vdebug */ #else +#ifndef pr_vdebig #define pr_vdebug(fmt, arg...) \ ({ if (0) pr_debug(fmt, ##arg); }) +#endif /* pr_vdebug */ #endif /*-------------------------------------------------------------------------*/ |