Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / hci_ll.c

diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index fb8445c7365ee0052fbd10284d0a895c12259fdf..38595e782d02e1c39dcbd82cc0fa0c94b0babfd2 100644 (file)
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -74,7 +74,7 @@ enum hcill_states_e {
 
 struct hcill_cmd {
        u8 cmd;
-} __attribute__((packed));
+} __packed;
 
 struct ll_struct {
        unsigned long rx_state;
@@ -517,7 +517,7 @@ static struct hci_uart_proto llp = {
        .flush          = ll_flush,
 };
 
-int ll_init(void)
+int __init ll_init(void)
 {
        int err = hci_uart_register_proto(&llp);
 
@@ -529,7 +529,7 @@ int ll_init(void)
        return err;
 }
 
-int ll_deinit(void)
+int __exit ll_deinit(void)
 {
        return hci_uart_unregister_proto(&llp);
 }