diff options
-rw-r--r-- | drivers/bluetooth/btmrvl_drv.h | 5 | ||||
-rw-r--r-- | drivers/bluetooth/btmrvl_sdio.h | 5 |
2 files changed, 0 insertions, 10 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); | |||
142 | void btmrvl_debugfs_init(struct hci_dev *hdev); | 139 | void btmrvl_debugfs_init(struct hci_dev *hdev); |
143 | void btmrvl_debugfs_remove(struct hci_dev *hdev); | 140 | void btmrvl_debugfs_remove(struct hci_dev *hdev); |
144 | #endif | 141 | #endif |
145 | |||
146 | #endif /* _BTMRVL_DRV_H_ */ | ||
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h index 08bef333ded9..6beb340685e3 100644 --- a/drivers/bluetooth/btmrvl_sdio.h +++ b/drivers/bluetooth/btmrvl_sdio.h | |||
@@ -19,9 +19,6 @@ | |||
19 | * | 19 | * |
20 | **/ | 20 | **/ |
21 | 21 | ||
22 | #ifndef _BTMRVL_SDIO_H_ | ||
23 | #define _BTMRVL_SDIO_H_ | ||
24 | |||
25 | #define SDIO_HEADER_LEN 4 | 22 | #define SDIO_HEADER_LEN 4 |
26 | 23 | ||
27 | /* SD block size can not bigger than 64 due to buf size limit in firmware */ | 24 | /* SD block size can not bigger than 64 due to buf size limit in firmware */ |
@@ -109,5 +106,3 @@ struct btmrvl_sdio_device { | |||
109 | /* Macros for Data Alignment : address */ | 106 | /* Macros for Data Alignment : address */ |
110 | #define ALIGN_ADDR(p, a) \ | 107 | #define ALIGN_ADDR(p, a) \ |
111 | ((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1)) | 108 | ((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1)) |
112 | |||
113 | #endif /* _BTMRVL_SDIO_H_ */ | ||