projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
drivers
/
bluetooth
/
hci_uart.h
diff --git
a/drivers/bluetooth/hci_uart.h
b/drivers/bluetooth/hci_uart.h
index
839bad1
..
0701395
100644
(file)
--- a/
drivers/bluetooth/hci_uart.h
+++ b/
drivers/bluetooth/hci_uart.h
@@
-35,7
+35,7
@@
#define HCIUARTGETFLAGS _IOR('U', 204, int)
/* UART protocols */
#define HCIUARTGETFLAGS _IOR('U', 204, int)
/* UART protocols */
-#define HCI_UART_MAX_PROTO 1
0
+#define HCI_UART_MAX_PROTO 1
2
#define HCI_UART_H4 0
#define HCI_UART_BCSP 1
#define HCI_UART_H4 0
#define HCI_UART_BCSP 1
@@
-47,6
+47,8
@@
#define HCI_UART_BCM 7
#define HCI_UART_QCA 8
#define HCI_UART_AG6XX 9
#define HCI_UART_BCM 7
#define HCI_UART_QCA 8
#define HCI_UART_AG6XX 9
+#define HCI_UART_NOKIA 10
+#define HCI_UART_MRVL 11
#define HCI_UART_RAW_DEVICE 0
#define HCI_UART_RESET_ON_INIT 1
#define HCI_UART_RAW_DEVICE 0
#define HCI_UART_RESET_ON_INIT 1
@@
-189,3
+191,8
@@
int qca_deinit(void);
int ag6xx_init(void);
int ag6xx_deinit(void);
#endif
int ag6xx_init(void);
int ag6xx_deinit(void);
#endif
+
+#ifdef CONFIG_BT_HCIUART_MRVL
+int mrvl_init(void);
+int mrvl_deinit(void);
+#endif