Commit 944fe798 authored by Marcel Holtmann's avatar Marcel Holtmann

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: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 08b0b0ce
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
* *
*/ */
#ifndef _BTMRVL_DRV_H_
#define _BTMRVL_DRV_H_
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
...@@ -142,5 +139,3 @@ int btmrvl_prepare_command(struct btmrvl_private *priv); ...@@ -142,5 +139,3 @@ int btmrvl_prepare_command(struct btmrvl_private *priv);
void btmrvl_debugfs_init(struct hci_dev *hdev); void btmrvl_debugfs_init(struct hci_dev *hdev);
void btmrvl_debugfs_remove(struct hci_dev *hdev); void btmrvl_debugfs_remove(struct hci_dev *hdev);
#endif #endif
#endif /* _BTMRVL_DRV_H_ */
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
* *
**/ **/
#ifndef _BTMRVL_SDIO_H_
#define _BTMRVL_SDIO_H_
#define SDIO_HEADER_LEN 4 #define SDIO_HEADER_LEN 4
/* SD block size can not bigger than 64 due to buf size limit in firmware */ /* SD block size can not bigger than 64 due to buf size limit in firmware */
...@@ -109,5 +106,3 @@ struct btmrvl_sdio_device { ...@@ -109,5 +106,3 @@ struct btmrvl_sdio_device {
/* Macros for Data Alignment : address */ /* Macros for Data Alignment : address */
#define ALIGN_ADDR(p, a) \ #define ALIGN_ADDR(p, a) \
((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1)) ((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
#endif /* _BTMRVL_SDIO_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment