openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Marcel Holtmann 2009-06-09 15:46:07 +02:00
parent 08b0b0ce8c
commit 944fe798c6
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/bluetooth/btmrvl_drv.h
View File

@ -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);
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_ */

5
drivers/bluetooth/btmrvl_sdio.h
View File

@ -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 {
/* 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_ */