aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_drv.h
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-09 09:46:07 -0400
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 17:25:33 -0400
commit944fe798c6a48336e82bbc0d4e280587325a4d95 (patch)
tree65654226935567146d98ee3dbd7fb1d12e934f32 /drivers/bluetooth/btmrvl_drv.h
parent08b0b0ce8c609b0e2284b134f0614e211374a038 (diff)
Bluetooth: Remove pointless ifdef protection for Marvell header files
Both header files of the Marvell Bluetooth driver are private anyway and if the driver happens to include them twice or they create a circular dependency then the driver needs fixing. So just remove both pointless ifdefs. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btmrvl_drv.h')
-rw-r--r--drivers/bluetooth/btmrvl_drv.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 7a12f6883bf0..5da3be407703 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -19,9 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#ifndef _BTMRVL_DRV_H_
23#define _BTMRVL_DRV_H_
24
25#include <linux/kthread.h> 22#include <linux/kthread.h>
26#include <linux/bitops.h> 23#include <linux/bitops.h>
27#include <net/bluetooth/bluetooth.h> 24#include <net/bluetooth/bluetooth.h>
@@ -142,5 +139,3 @@ int btmrvl_prepare_command(struct btmrvl_private *priv);
142void btmrvl_debugfs_init(struct hci_dev *hdev); 139void btmrvl_debugfs_init(struct hci_dev *hdev);
143void btmrvl_debugfs_remove(struct hci_dev *hdev); 140void btmrvl_debugfs_remove(struct hci_dev *hdev);
144#endif 141#endif
145
146#endif /* _BTMRVL_DRV_H_ */