summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-09 15:46:07 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 14:25:33 -0700
commit944fe798c6a48336e82bbc0d4e280587325a4d95 (patch)
tree65654226935567146d98ee3dbd7fb1d12e934f32
parent08b0b0ce8c609b0e2284b134f0614e211374a038 (diff)
downloadop-kernel-dev-944fe798c6a48336e82bbc0d4e280587325a4d95.zip
op-kernel-dev-944fe798c6a48336e82bbc0d4e280587325a4d95.tar.gz
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>
-rw-r--r--drivers/bluetooth/btmrvl_drv.h5
-rw-r--r--drivers/bluetooth/btmrvl_sdio.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 7a12f68..5da3be4 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -19,9 +19,6 @@
*
*/
-#ifndef _BTMRVL_DRV_H_
-#define _BTMRVL_DRV_H_
-
#include <linux/kthread.h>
#include <linux/bitops.h>
#include <net/bluetooth/bluetooth.h>
@@ -142,5 +139,3 @@ int btmrvl_prepare_command(struct btmrvl_private *priv);
void btmrvl_debugfs_init(struct hci_dev *hdev);
void btmrvl_debugfs_remove(struct hci_dev *hdev);
#endif
-
-#endif /* _BTMRVL_DRV_H_ */
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 08bef33..6beb340 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -19,9 +19,6 @@
*
**/
-#ifndef _BTMRVL_SDIO_H_
-#define _BTMRVL_SDIO_H_
-
#define SDIO_HEADER_LEN 4
/* SD block size can not bigger than 64 due to buf size limit in firmware */
@@ -109,5 +106,3 @@ struct btmrvl_sdio_device {
/* Macros for Data Alignment : address */
#define ALIGN_ADDR(p, a) \
((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
-
-#endif /* _BTMRVL_SDIO_H_ */
OpenPOWER on IntegriCloud