Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/bluetooth/btmrvl_drv.h

+0 −5
Original line number Diff line number Diff line
@@ -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_ */

drivers/bluetooth/btmrvl_sdio.h

+0 −5
Original line number Diff line number Diff line
@@ -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_ */