diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/media/dvb/dvb-usb/dibusb.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dibusb.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h index 6611f62977c0..2d99d05c7eab 100644 --- a/drivers/media/dvb/dvb-usb/dibusb.h +++ b/drivers/media/dvb/dvb-usb/dibusb.h | |||
| @@ -11,7 +11,9 @@ | |||
| 11 | #ifndef _DVB_USB_DIBUSB_H_ | 11 | #ifndef _DVB_USB_DIBUSB_H_ |
| 12 | #define _DVB_USB_DIBUSB_H_ | 12 | #define _DVB_USB_DIBUSB_H_ |
| 13 | 13 | ||
| 14 | #define DVB_USB_LOG_PREFIX "dibusb" | 14 | #ifndef DVB_USB_LOG_PREFIX |
| 15 | #define DVB_USB_LOG_PREFIX "dibusb" | ||
| 16 | #endif | ||
| 15 | #include "dvb-usb.h" | 17 | #include "dvb-usb.h" |
| 16 | 18 | ||
| 17 | #include "dib3000.h" | 19 | #include "dib3000.h" |